[Frugalware-git] pacman-tools: dg: use git stash pop instead of our own hack

[Miklos Vajna]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2e3a88ee21f3435a7bf7a0fd2cf63cacaada9a7e

commit 2e3a88ee21f3435a7bf7a0fd2cf63cacaada9a7e
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Wed Apr 9 15:49:13 2008 +0200

dg: use git stash pop instead of our own hack

diff --git a/darcs-git.py b/darcs-git.py
index 97aed19..b4ef917 100755
--- a/darcs-git.py
+++ b/darcs-git.py
@@ -658,7 +658,7 @@ Options:
changes = False
if os.system("git pull --rebase %s" % options.gitopts) != 0:
return(1)
-       if changes and os.system("git stash apply --index && sed -i '$d' `git 
rev-parse --show-cdup`.git/logs/refs/stash") != 0:
+       if changes and os.system("git stash pop") != 0:
return(1)

def send(argv):
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git