Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Another (potentially life-saving) idea for submit --direct
author
Simon Hausmann
<simon@lst.de>
Sun, 20 May 2007 21:52:51 +0000
(23:52 +0200)
committer
Simon Hausmann
<simon@lst.de>
Sun, 20 May 2007 21:52:51 +0000
(23:52 +0200)
Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
24f7b53
)
diff --git
a/contrib/fast-import/git-p4
b/contrib/fast-import/git-p4
index 92522417cd27f6baefae00b39e349388efaffc38..5055f3214039666f926cb2f3e3b9324f01fb8c2f 100755
(executable)
--- a/
contrib/fast-import/git-p4
+++ b/
contrib/fast-import/git-p4
@@
-10,6
+10,12
@@
# TODO: * implement git-p4 rollback <perforce change number> for debugging
# to roll back all p4 remote branches to a commit older or equal to
# the specified change.
# TODO: * implement git-p4 rollback <perforce change number> for debugging
# to roll back all p4 remote branches to a commit older or equal to
# the specified change.
+# * for git-p4 submit --direct it would be nice to still create a
+# git commit without updating HEAD before submitting to perforce.
+# With the commit sha1 printed (or recoded in a .git/foo file?)
+# it's possible to recover if anything goes wrong instead of potentially
+# loosing a change entirely because it was never comitted to git and
+# the p4 submit failed (or resulted in lots of conflicts, etc.)
#
import optparse, sys, os, marshal, popen2, subprocess, shelve
#
import optparse, sys, os, marshal, popen2, subprocess, shelve