summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <simon@lst.de>2007-05-20 23:52:51 +0200
committerLibravatar Simon Hausmann <simon@lst.de>2007-05-20 23:52:51 +0200
commitb1561ee25628c074b3afac738ead387181d3b311 (patch)
tree7a7ddcba8a403669d6df046f07af80dd9b3b280c /contrib/fast-import/git-p4
parentHad an idea for debugging, record it :) (diff)
downloadtgif-b1561ee25628c074b3afac738ead387181d3b311.tar.xz
Another (potentially life-saving) idea for submit --direct
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import/git-p4')
-rwxr-xr-xcontrib/fast-import/git-p46
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 92522417cd..5055f32140 100755
--- 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.
+# * 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