These patches fix a bug that bites me often enough when rebasing Git for
Windows.
The symptom is that .git/CHERRY_PICK_HEAD is left behind after skipping
an already-merged patch with `git rebase --continue` instead of `git
rebase --skip`. I always prefer the former invocation because the latter
would also skip legitimate patches if there were merge conflicts, while
the former would not allow that.
Changes since v1:
- no longer uses ':' to make the comment a no-op statement
- sets the fake editor correctly in the test (I verified that by
rebasing onto v2.2.2 and running the test with and without setting the
fake editor)
Interdiff below the diffstat.
Johannes Schindelin (2):
t3404: demonstrate CHERRY_PICK_HEAD bug
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
git-rebase--interactive.sh | 6 +++++-
t/t3404-rebase-interactive.sh | 21 +++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 16e0a82..5ff0f1c 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -849,7 +849,7 @@ continue)
# do we have anything to commit?
if git diff-index --cached --quiet HEAD --
then
- : Nothing to commit -- skip this commit
+ # Nothing to commit -- skip this commit
test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 241d4d1..f3337ad 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1114,7 +1114,8 @@ test_expect_success 'rebase --continue removes
CHERRY_PICK_HEAD' '
git tag seq-onto &&
git reset --hard HEAD~2 &&
git cherry-pick seq-onto &&
- test_must_fail git rebase -i seq-onto &&
+ set_fake_editor &&
+ FAKE_LINES= test_must_fail git rebase -i seq-onto &&
test -d .git/rebase-merge &&
git rebase --continue &&
git diff seq-onto &&
--
2.3.1.windows.1.9.g8c01ab4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
