Browse Source

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

Signed-off-by: Simon Hausmann <hausmann@kde.org>
maint
Simon Hausmann 18 years ago
parent
commit
5d0b6042d4
  1. 2
      contrib/fast-import/git-p4.py

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

@ -197,7 +197,7 @@ class P4Sync(Command): @@ -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)

Loading…
Cancel
Save