Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=6481cda00035134cb71503c497c4bfff0301ef05
commit 6481cda00035134cb71503c497c4bfff0301ef05
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sat Jun 7 18:01:56 2008 +0200
dg unrecord: use git reset --mixed instead of --soft and custom workarounds
diff --git a/darcs-git.py b/darcs-git.py
index 1b91883..9faf55b 100755
--- a/darcs-git.py
+++ b/darcs-git.py
@@ -815,15 +815,7 @@ Options:
if ret in ("n", "q"):
sys.exit(0)
print "Invalid response, try again!"
- os.system("git reset --soft HEAD^ %s" % " ".join(argv))
- sock = os.popen("git diff --cached --name-status")
- files = sock.readlines()
- sock.close()
- for i in files:
- status, name = i.split("\t")
- if status != "M":
- files.remove(i)
- os.system("git reset HEAD %s >/dev/null" % "
".join([i.split("\t")[1].strip() for i in files]))
+ os.system("git reset HEAD^ %s >/dev/null" % " ".join(argv))
print "Finished unrecording."
def unpull(argv):
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
