OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04219c0
)
Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering...
author
Simon Hausmann
<hausmann@kde.org>
Wed, 21 Mar 2007 09:57:54 +0000
(10:57 +0100)
committer
Simon Hausmann
<hausmann@kde.org>
Wed, 21 Mar 2007 09:57:54 +0000
(10:57 +0100)
Signed-off-by: Simon Hausmann <hausmann@kde.org>
contrib/fast-import/git-p4.py
patch
|
blob
|
history
diff --git
a/contrib/fast-import/git-p4.py
b/contrib/fast-import/git-p4.py
index
2009dce
..
336c3ea
100755
(executable)
--- a/
contrib/fast-import/git-p4.py
+++ b/
contrib/fast-import/git-p4.py
@@
-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)