summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Lucarella <leandro.lucarella@sociomantic.com>2015-05-05 19:01:20 +0200
committerMihails Strasuns <mihails.strasuns.contractor@sociomantic.com>2015-05-07 04:40:13 +0300
commit858060222c4158526aeb5c6791bcd5757ba66849 (patch)
tree5690a9f144206c2d2e9a911f19200bdae226cf06
parent0c5e9e86d51107e1ec4eafaef83a4a43c7659345 (diff)
pull rebase: Fix --pause resuming
The state file was created with O_EXCL, and was being recreated when resuming a --pause, but it was not removed before, so if failed with an EEXIST error.
-rwxr-xr-xgit-hub1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-hub b/git-hub
index e88432d..a73a85c 100755
--- a/git-hub
+++ b/git-hub
@@ -1751,6 +1751,7 @@ class RebaseCmd (PullUtil):
cls.in_pause = True
# Re-create the rebasing file as we are going
# to pause
+ cls.remove_rebasing_file()
cls.create_rebasing_file(pull, args, old_ref)
interrupt("Rebase done, now --pause'ing. "
'Use --continue {}when done.',