Changeset 121592 in spip-zone


Ignore:
Timestamp:
Feb 5, 2020, 9:15:03 AM (2 weeks ago)
Author:
Cerdic
Message:

stash silencieux et stash pop siliencieux et conditionnel

Location:
_plugins_/trad-lang/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • _plugins_/trad-lang/trunk

    • Property subgit:lock:0ff4801c8617e41f540755f2dea2f640d8b03029 deleted
    • Property subgit:lock:c7a68983d20d4a72627b563387021d207a3007d0 set to 2020-02-05T10:15:07.974
  • _plugins_/trad-lang/trunk/salvatore/vcs/git.php

    r121590 r121592  
    186186        // on ajoute tous les fichiers pour commit
    187187        $commands = [
    188                 "git stash 2>&1",
     188                "git stash -q 2>&1",
    189189                "git pull --rebase 2>&1",
    190                 "git stash pop 2>&1",
     190                "if [[ \$(git stash list) ]]; then git stash pop -q 2>&1; fi;",
    191191                "git push 2>&1",
    192192        ];
Note: See TracChangeset for help on using the changeset viewer.