undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.

Browse Source 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
Simon Hausmann 2007-03-21 10:57:54 +01:00
parent 04219c04b7
commit 5d0b6042d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/git-p4.py
View File

@ -197,7 +197,7 @@ class P4Sync(Command):
die("unknown modifier %s for %s" % (modifier, path))
if self.applyAsPatch:
system("git-diff-tree -p \"%s^\" \"%s\" | patch -p1" % (id, id))
system("git-diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
else:
system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
system("git cherry-pick --no-commit \"%s\"" % id)