Changeset 121592 in spip-zone

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:

• . (modified) (2 props)
• salvatore/vcs/git.php (modified) (1 diff)

_plugins_/trad-lang/trunk/salvatore/vcs/git.php

@@ -186 +186 @@
         // on ajoute tous les fichiers pour commit
         $commands = [
-                "git stash 2>&1",
+                "git stash -q 2>&1",
                 "git pull --rebase 2>&1",
-                "git stash pop 2>&1",
+                "if [[ \$(git stash list) ]]; then git stash pop -q 2>&1; fi;",
                 "git push 2>&1",
         ];