2007-06-25 04:11:14 +04:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Johannes E. Schindelin
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git rebase interactive
|
|
|
|
|
|
|
|
This test runs git rebase "interactively", by faking an edit, and verifies
|
|
|
|
that the result still makes sense.
|
2010-10-31 10:39:51 +03:00
|
|
|
|
|
|
|
Initial setup:
|
|
|
|
|
|
|
|
one - two - three - four (conflict-branch)
|
|
|
|
/
|
|
|
|
A - B - C - D - E (master)
|
|
|
|
| \
|
|
|
|
| F - G - H (branch1)
|
|
|
|
| \
|
|
|
|
|\ I (branch2)
|
|
|
|
| \
|
|
|
|
| J - K - L - M (no-conflict-branch)
|
|
|
|
\
|
|
|
|
N - O - P (no-ff-branch)
|
|
|
|
|
|
|
|
where A, B, D and G all touch file1, and one, two, three, four all
|
|
|
|
touch file "conflict".
|
2007-06-25 04:11:14 +04:00
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2009-08-09 12:37:52 +04:00
|
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
2009-01-28 01:34:29 +03:00
|
|
|
|
2010-10-31 10:40:30 +03:00
|
|
|
test_cmp_rev () {
|
2010-11-10 02:20:20 +03:00
|
|
|
git rev-parse --verify "$1" >expect.rev &&
|
|
|
|
git rev-parse --verify "$2" >actual.rev &&
|
2010-10-31 10:40:30 +03:00
|
|
|
test_cmp expect.rev actual.rev
|
|
|
|
}
|
|
|
|
|
2009-01-28 01:34:29 +03:00
|
|
|
set_fake_editor
|
|
|
|
|
2010-03-24 23:34:04 +03:00
|
|
|
# WARNING: Modifications to the initial repository can change the SHA ID used
|
|
|
|
# in the expect2 file for the 'stop on conflicting pick' test.
|
|
|
|
|
2007-06-25 04:11:14 +04:00
|
|
|
test_expect_success 'setup' '
|
2009-12-07 07:22:58 +03:00
|
|
|
test_commit A file1 &&
|
|
|
|
test_commit B file1 &&
|
|
|
|
test_commit C file2 &&
|
|
|
|
test_commit D file1 &&
|
|
|
|
test_commit E file3 &&
|
2007-06-25 04:11:14 +04:00
|
|
|
git checkout -b branch1 A &&
|
2009-12-07 07:22:58 +03:00
|
|
|
test_commit F file4 &&
|
|
|
|
test_commit G file1 &&
|
|
|
|
test_commit H file5 &&
|
2007-06-25 04:11:14 +04:00
|
|
|
git checkout -b branch2 F &&
|
2010-10-31 10:30:58 +03:00
|
|
|
test_commit I file6 &&
|
2010-01-14 08:54:56 +03:00
|
|
|
git checkout -b conflict-branch A &&
|
2010-10-31 10:38:25 +03:00
|
|
|
test_commit one conflict &&
|
|
|
|
test_commit two conflict &&
|
|
|
|
test_commit three conflict &&
|
|
|
|
test_commit four conflict &&
|
2010-01-14 08:54:56 +03:00
|
|
|
git checkout -b no-conflict-branch A &&
|
2010-10-31 10:38:25 +03:00
|
|
|
test_commit J fileJ &&
|
|
|
|
test_commit K fileK &&
|
|
|
|
test_commit L fileL &&
|
|
|
|
test_commit M fileM &&
|
2010-03-24 23:34:04 +03:00
|
|
|
git checkout -b no-ff-branch A &&
|
2010-10-31 10:38:25 +03:00
|
|
|
test_commit N fileN &&
|
|
|
|
test_commit O fileO &&
|
|
|
|
test_commit P fileP
|
2007-06-25 04:11:14 +04:00
|
|
|
'
|
|
|
|
|
2010-08-10 19:17:51 +04:00
|
|
|
# "exec" commands are ran with the user shell by default, but this may
|
|
|
|
# be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
|
|
|
|
# to create a file. Unseting SHELL avoids such non-portable behavior
|
2010-12-27 11:03:43 +03:00
|
|
|
# in tests. It must be exported for it to take effect where needed.
|
2010-08-10 19:17:51 +04:00
|
|
|
SHELL=
|
2010-12-27 11:03:43 +03:00
|
|
|
export SHELL
|
2010-08-10 19:17:51 +04:00
|
|
|
|
|
|
|
test_expect_success 'rebase -i with the exec command' '
|
|
|
|
git checkout master &&
|
|
|
|
(
|
|
|
|
FAKE_LINES="1 exec_>touch-one
|
|
|
|
2 exec_>touch-two exec_false exec_>touch-three
|
|
|
|
3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i A
|
|
|
|
) &&
|
2010-08-10 19:17:52 +04:00
|
|
|
test_path_is_file touch-one &&
|
|
|
|
test_path_is_file touch-two &&
|
|
|
|
test_path_is_missing touch-three " (should have stopped before)" &&
|
2010-10-31 10:40:30 +03:00
|
|
|
test_cmp_rev C HEAD &&
|
2010-08-10 19:17:51 +04:00
|
|
|
git rebase --continue &&
|
2010-08-10 19:17:52 +04:00
|
|
|
test_path_is_file touch-three &&
|
|
|
|
test_path_is_file "touch-file name with spaces" &&
|
|
|
|
test_path_is_file touch-after-semicolon &&
|
2010-10-31 10:40:30 +03:00
|
|
|
test_cmp_rev master HEAD &&
|
2010-08-10 19:17:51 +04:00
|
|
|
rm -f touch-*
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -i with the exec command runs from tree root' '
|
|
|
|
git checkout master &&
|
2010-09-06 22:41:06 +04:00
|
|
|
mkdir subdir && (cd subdir &&
|
2010-08-10 19:17:51 +04:00
|
|
|
FAKE_LINES="1 exec_>touch-subdir" \
|
2010-09-06 22:41:06 +04:00
|
|
|
git rebase -i HEAD^
|
|
|
|
) &&
|
2010-08-10 19:17:52 +04:00
|
|
|
test_path_is_file touch-subdir &&
|
2010-08-10 19:17:51 +04:00
|
|
|
rm -fr subdir
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -i with the exec command checks tree cleanness' '
|
|
|
|
git checkout master &&
|
|
|
|
(
|
|
|
|
FAKE_LINES="exec_echo_foo_>file1 1" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i HEAD^
|
|
|
|
) &&
|
2010-10-31 10:40:30 +03:00
|
|
|
test_cmp_rev master^ HEAD &&
|
2010-08-10 19:17:51 +04:00
|
|
|
git reset --hard &&
|
|
|
|
git rebase --continue
|
|
|
|
'
|
|
|
|
|
2007-06-25 04:11:14 +04:00
|
|
|
test_expect_success 'no changes are a nop' '
|
2010-01-14 08:54:56 +03:00
|
|
|
git checkout branch2 &&
|
2007-06-25 04:11:14 +04:00
|
|
|
git rebase -i F &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
|
2007-06-25 04:11:14 +04:00
|
|
|
test $(git rev-parse I) = $(git rev-parse HEAD)
|
|
|
|
'
|
|
|
|
|
2007-08-02 02:31:03 +04:00
|
|
|
test_expect_success 'test the [branch] option' '
|
|
|
|
git checkout -b dead-end &&
|
|
|
|
git rm file6 &&
|
|
|
|
git commit -m "stop here" &&
|
|
|
|
git rebase -i F branch2 &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
|
|
|
|
test $(git rev-parse I) = $(git rev-parse branch2) &&
|
2007-08-02 02:31:03 +04:00
|
|
|
test $(git rev-parse I) = $(git rev-parse HEAD)
|
|
|
|
'
|
|
|
|
|
2008-06-22 03:55:50 +04:00
|
|
|
test_expect_success 'test --onto <branch>' '
|
|
|
|
git checkout -b test-onto branch2 &&
|
|
|
|
git rebase -i --onto branch1 F &&
|
|
|
|
test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
|
|
|
|
test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
|
|
|
|
test $(git rev-parse I) = $(git rev-parse branch2)
|
|
|
|
'
|
|
|
|
|
2007-06-25 04:11:14 +04:00
|
|
|
test_expect_success 'rebase on top of a non-conflicting commit' '
|
|
|
|
git checkout branch1 &&
|
|
|
|
git tag original-branch1 &&
|
|
|
|
git rebase -i branch2 &&
|
|
|
|
test file6 = $(git diff --name-only original-branch1) &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
|
|
|
|
test $(git rev-parse I) = $(git rev-parse branch2) &&
|
2007-06-25 04:11:14 +04:00
|
|
|
test $(git rev-parse I) = $(git rev-parse HEAD~2)
|
|
|
|
'
|
|
|
|
|
2007-06-25 21:58:28 +04:00
|
|
|
test_expect_success 'reflog for the branch shows state before rebase' '
|
|
|
|
test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
|
|
|
|
'
|
|
|
|
|
2007-06-25 04:11:14 +04:00
|
|
|
test_expect_success 'exchange two commits' '
|
|
|
|
FAKE_LINES="2 1" git rebase -i HEAD~2 &&
|
2008-03-13 00:34:34 +03:00
|
|
|
test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
|
|
|
|
test G = $(git cat-file commit HEAD | sed -ne \$p)
|
2007-06-25 04:11:14 +04:00
|
|
|
'
|
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
diff --git a/file1 b/file1
|
2009-12-07 07:22:58 +03:00
|
|
|
index f70f10e..fd79235 100644
|
2007-06-25 04:11:14 +04:00
|
|
|
--- a/file1
|
|
|
|
+++ b/file1
|
2009-12-07 07:22:58 +03:00
|
|
|
@@ -1 +1 @@
|
|
|
|
-A
|
|
|
|
+G
|
2007-06-25 04:11:14 +04:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat > expect2 << EOF
|
2009-07-02 00:18:04 +04:00
|
|
|
<<<<<<< HEAD
|
2009-12-07 07:22:58 +03:00
|
|
|
D
|
2007-06-25 04:11:14 +04:00
|
|
|
=======
|
2009-12-07 07:22:58 +03:00
|
|
|
G
|
2010-03-24 23:34:04 +03:00
|
|
|
>>>>>>> 5d18e54... G
|
2007-06-25 04:11:14 +04:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'stop on conflicting pick' '
|
|
|
|
git tag new-branch1 &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git rebase -i master &&
|
|
|
|
test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
|
2008-07-16 05:33:44 +04:00
|
|
|
test_cmp expect .git/rebase-merge/patch &&
|
2008-03-13 00:36:36 +03:00
|
|
|
test_cmp expect2 file1 &&
|
2008-09-03 12:59:27 +04:00
|
|
|
test "$(git diff --name-status |
|
2008-06-22 03:55:50 +04:00
|
|
|
sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
|
2008-07-16 05:33:44 +04:00
|
|
|
test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
|
|
|
|
test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
|
2007-06-25 04:11:14 +04:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'abort' '
|
|
|
|
git rebase --abort &&
|
|
|
|
test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
|
2010-08-10 19:17:52 +04:00
|
|
|
test_path_is_missing .git/rebase-merge
|
2007-06-25 04:11:14 +04:00
|
|
|
'
|
|
|
|
|
2010-06-08 12:16:11 +04:00
|
|
|
test_expect_success 'abort with error when new base cannot be checked out' '
|
|
|
|
git rm --cached file1 &&
|
|
|
|
git commit -m "remove file in base" &&
|
|
|
|
test_must_fail git rebase -i master > output 2>&1 &&
|
2010-08-11 12:38:07 +04:00
|
|
|
grep "The following untracked working tree files would be overwritten by checkout:" \
|
2010-06-08 12:16:11 +04:00
|
|
|
output &&
|
2010-08-11 12:38:07 +04:00
|
|
|
grep "file1" output &&
|
2010-08-10 19:17:52 +04:00
|
|
|
test_path_is_missing .git/rebase-merge &&
|
2010-06-08 12:16:11 +04:00
|
|
|
git reset --hard HEAD^
|
|
|
|
'
|
|
|
|
|
2007-06-25 04:11:14 +04:00
|
|
|
test_expect_success 'retain authorship' '
|
|
|
|
echo A > file7 &&
|
|
|
|
git add file7 &&
|
2007-06-25 21:56:55 +04:00
|
|
|
test_tick &&
|
2007-06-25 04:11:14 +04:00
|
|
|
GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
|
|
|
|
git tag twerp &&
|
|
|
|
git rebase -i --onto master HEAD^ &&
|
|
|
|
git show HEAD | grep "^Author: Twerp Snog"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'squash' '
|
|
|
|
git reset --hard twerp &&
|
|
|
|
echo B > file7 &&
|
2007-06-25 21:56:55 +04:00
|
|
|
test_tick &&
|
2007-06-25 04:11:14 +04:00
|
|
|
GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
|
|
|
|
echo "******************************" &&
|
2010-01-14 08:54:49 +03:00
|
|
|
FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
|
2010-01-14 08:54:48 +03:00
|
|
|
git rebase -i --onto master HEAD~2 &&
|
2007-06-25 04:11:14 +04:00
|
|
|
test B = $(cat file7) &&
|
|
|
|
test $(git rev-parse HEAD^) = $(git rev-parse master)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'retain authorship when squashing' '
|
2007-09-30 03:34:23 +04:00
|
|
|
git show HEAD | grep "^Author: Twerp Snog"
|
2007-06-25 04:11:14 +04:00
|
|
|
'
|
|
|
|
|
2007-12-18 00:01:25 +03:00
|
|
|
test_expect_success '-p handles "no changes" gracefully' '
|
|
|
|
HEAD=$(git rev-parse HEAD) &&
|
|
|
|
git rebase -i -p HEAD^ &&
|
2008-08-14 01:41:23 +04:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet &&
|
|
|
|
git diff-index --quiet --cached HEAD -- &&
|
2007-12-18 00:01:25 +03:00
|
|
|
test $HEAD = $(git rev-parse HEAD)
|
|
|
|
'
|
|
|
|
|
2010-06-01 05:43:35 +04:00
|
|
|
test_expect_failure 'exchange two commits with -p' '
|
|
|
|
FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
|
|
|
|
test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
|
|
|
|
test G = $(git cat-file commit HEAD | sed -ne \$p)
|
|
|
|
'
|
|
|
|
|
2007-06-25 21:59:43 +04:00
|
|
|
test_expect_success 'preserve merges with -p' '
|
|
|
|
git checkout -b to-be-preserved master^ &&
|
|
|
|
: > unrelated-file &&
|
|
|
|
git add unrelated-file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "unrelated" &&
|
2008-07-12 19:47:31 +04:00
|
|
|
git checkout -b another-branch master &&
|
2007-06-25 21:59:43 +04:00
|
|
|
echo B > file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m J file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git merge to-be-preserved &&
|
|
|
|
echo C > file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m K file1 &&
|
2008-07-12 19:47:31 +04:00
|
|
|
echo D > file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m L1 file1 &&
|
|
|
|
git checkout HEAD^ &&
|
|
|
|
echo 1 > unrelated-file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m L2 unrelated-file &&
|
|
|
|
test_tick &&
|
|
|
|
git merge another-branch &&
|
|
|
|
echo E > file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m M file1 &&
|
|
|
|
git checkout -b to-be-rebased &&
|
2007-07-08 06:01:29 +04:00
|
|
|
test_tick &&
|
2007-06-25 21:59:43 +04:00
|
|
|
git rebase -i -p --onto branch1 master &&
|
2008-08-14 01:41:23 +04:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet &&
|
|
|
|
git diff-index --quiet --cached HEAD -- &&
|
2008-07-12 19:47:31 +04:00
|
|
|
test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
|
|
|
|
test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
|
|
|
|
test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
|
|
|
|
test $(git show HEAD~5:file1) = B &&
|
|
|
|
test $(git show HEAD~3:file1) = C &&
|
|
|
|
test $(git show HEAD:file1) = E &&
|
|
|
|
test $(git show HEAD:unrelated-file) = 1
|
2007-06-25 21:59:43 +04:00
|
|
|
'
|
|
|
|
|
2008-08-14 01:41:24 +04:00
|
|
|
test_expect_success 'edit ancestor with -p' '
|
rebase -i -p: include non-first-parent commits in todo list
Consider this graph:
D---E (topic, HEAD)
/ /
A---B---C (master)
\
F (topic2)
and the following three commands:
1. git rebase -i -p A
2. git rebase -i -p --onto F A
3. git rebase -i -p B
Currently, (1) and (2) will pick B, D, C, and E onto A and F,
respectively. However, (3) will only pick D and E onto B, but not C,
which is inconsistent with (1) and (2). As a result, we cannot modify C
during the interactive-rebase.
The current behavior also creates a bug if we do:
4. git rebase -i -p C
In (4), E is never picked. And since interactive-rebase resets "HEAD"
to "onto" before picking any commits, D and E are lost after the
interactive-rebase.
This patch fixes the inconsistency and bug by ensuring that all children
of upstream are always picked. This essentially reverts the commit:
d80d6bc146232d81f1bb4bc58e5d89263fd228d4
When compiling the todo list, commits reachable from "upstream" should
never be skipped under any conditions. Otherwise, we lose the ability
to modify them like (3), and create a bug like (4).
Two of the tests contain a scenario like (3). Since the new behavior
added more commits for picking, these tests need to be updated to
account for the additional pick lines. A new test has also been added
for (4).
Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-06-19 02:12:01 +04:00
|
|
|
FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
|
2008-08-14 01:41:24 +04:00
|
|
|
echo 2 > unrelated-file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m L2-modified --amend unrelated-file &&
|
|
|
|
git rebase --continue &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet &&
|
|
|
|
git diff-index --quiet --cached HEAD -- &&
|
|
|
|
test $(git show HEAD:unrelated-file) = 2
|
|
|
|
'
|
|
|
|
|
2007-07-08 06:01:29 +04:00
|
|
|
test_expect_success '--continue tries to commit' '
|
|
|
|
test_tick &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
|
2007-07-08 06:01:29 +04:00
|
|
|
echo resolved > file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
|
|
|
|
test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
|
|
|
|
git show HEAD | grep chouette
|
|
|
|
'
|
|
|
|
|
2007-07-08 06:02:47 +04:00
|
|
|
test_expect_success 'verbose flag is heeded, even after --continue' '
|
2011-05-28 00:16:14 +04:00
|
|
|
git reset --hard master@{1} &&
|
2007-07-08 06:02:47 +04:00
|
|
|
test_tick &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
|
2007-07-08 06:02:47 +04:00
|
|
|
echo resolved > file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
git rebase --continue > output &&
|
|
|
|
grep "^ file1 | 2 +-$" output
|
|
|
|
'
|
|
|
|
|
2007-07-21 21:09:41 +04:00
|
|
|
test_expect_success 'multi-squash only fires up editor once' '
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
|
|
|
FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
|
2010-01-14 08:54:48 +03:00
|
|
|
EXPECT_HEADER_COUNT=4 \
|
2007-07-21 21:09:41 +04:00
|
|
|
git rebase -i $base &&
|
|
|
|
test $base = $(git rev-parse HEAD^) &&
|
|
|
|
test 1 = $(git show | grep ONCE | wc -l)
|
|
|
|
'
|
|
|
|
|
2010-01-14 08:54:55 +03:00
|
|
|
test_expect_success 'multi-fixup does not fire up editor' '
|
2009-12-07 12:20:59 +03:00
|
|
|
git checkout -b multi-fixup E &&
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
2010-01-14 08:54:55 +03:00
|
|
|
FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
|
2009-12-07 12:20:59 +03:00
|
|
|
git rebase -i $base &&
|
|
|
|
test $base = $(git rev-parse HEAD^) &&
|
2010-01-14 08:54:55 +03:00
|
|
|
test 0 = $(git show | grep NEVER | wc -l) &&
|
2009-12-07 12:20:59 +03:00
|
|
|
git checkout to-be-rebased &&
|
|
|
|
git branch -D multi-fixup
|
|
|
|
'
|
|
|
|
|
2010-01-14 08:54:57 +03:00
|
|
|
test_expect_success 'commit message used after conflict' '
|
|
|
|
git checkout -b conflict-fixup conflict-branch &&
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
|
|
|
(
|
|
|
|
FAKE_LINES="1 fixup 3 fixup 4" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i $base
|
|
|
|
) &&
|
|
|
|
echo three > conflict &&
|
|
|
|
git add conflict &&
|
|
|
|
FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
|
|
|
|
git rebase --continue &&
|
|
|
|
test $base = $(git rev-parse HEAD^) &&
|
|
|
|
test 1 = $(git show | grep ONCE | wc -l) &&
|
|
|
|
git checkout to-be-rebased &&
|
|
|
|
git branch -D conflict-fixup
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'commit message retained after conflict' '
|
|
|
|
git checkout -b conflict-squash conflict-branch &&
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
|
|
|
(
|
|
|
|
FAKE_LINES="1 fixup 3 squash 4" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i $base
|
|
|
|
) &&
|
|
|
|
echo three > conflict &&
|
|
|
|
git add conflict &&
|
|
|
|
FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
|
|
|
|
git rebase --continue &&
|
|
|
|
test $base = $(git rev-parse HEAD^) &&
|
|
|
|
test 2 = $(git show | grep TWICE | wc -l) &&
|
|
|
|
git checkout to-be-rebased &&
|
|
|
|
git branch -D conflict-squash
|
|
|
|
'
|
|
|
|
|
2009-12-07 12:20:59 +03:00
|
|
|
cat > expect-squash-fixup << EOF
|
|
|
|
B
|
|
|
|
|
|
|
|
D
|
|
|
|
|
|
|
|
ONCE
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'squash and fixup generate correct log messages' '
|
|
|
|
git checkout -b squash-fixup E &&
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
|
|
|
FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
|
2010-01-14 08:54:48 +03:00
|
|
|
EXPECT_HEADER_COUNT=4 \
|
2009-12-07 12:20:59 +03:00
|
|
|
git rebase -i $base &&
|
|
|
|
git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
|
|
|
|
test_cmp expect-squash-fixup actual-squash-fixup &&
|
|
|
|
git checkout to-be-rebased &&
|
|
|
|
git branch -D squash-fixup
|
|
|
|
'
|
|
|
|
|
2010-01-12 18:38:36 +03:00
|
|
|
test_expect_success 'squash ignores comments' '
|
|
|
|
git checkout -b skip-comments E &&
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
|
|
|
FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
|
|
|
|
EXPECT_HEADER_COUNT=4 \
|
|
|
|
git rebase -i $base &&
|
|
|
|
test $base = $(git rev-parse HEAD^) &&
|
|
|
|
test 1 = $(git show | grep ONCE | wc -l) &&
|
|
|
|
git checkout to-be-rebased &&
|
|
|
|
git branch -D skip-comments
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'squash ignores blank lines' '
|
|
|
|
git checkout -b skip-blank-lines E &&
|
|
|
|
base=$(git rev-parse HEAD~4) &&
|
|
|
|
FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
|
|
|
|
EXPECT_HEADER_COUNT=4 \
|
|
|
|
git rebase -i $base &&
|
|
|
|
test $base = $(git rev-parse HEAD^) &&
|
|
|
|
test 1 = $(git show | grep ONCE | wc -l) &&
|
|
|
|
git checkout to-be-rebased &&
|
|
|
|
git branch -D skip-blank-lines
|
|
|
|
'
|
|
|
|
|
2007-07-25 00:43:09 +04:00
|
|
|
test_expect_success 'squash works as expected' '
|
2010-01-14 08:54:56 +03:00
|
|
|
git checkout -b squash-works no-conflict-branch &&
|
2007-07-25 00:43:09 +04:00
|
|
|
one=$(git rev-parse HEAD~3) &&
|
2010-01-14 08:54:49 +03:00
|
|
|
FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \
|
2010-01-14 08:54:48 +03:00
|
|
|
git rebase -i HEAD~3 &&
|
2007-07-25 00:43:09 +04:00
|
|
|
test $one = $(git rev-parse HEAD~2)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'interrupted squash works as expected' '
|
2010-01-14 08:54:56 +03:00
|
|
|
git checkout -b interrupted-squash conflict-branch &&
|
2007-07-25 00:43:09 +04:00
|
|
|
one=$(git rev-parse HEAD~3) &&
|
2008-06-22 03:55:50 +04:00
|
|
|
(
|
|
|
|
FAKE_LINES="1 squash 3 2" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i HEAD~3
|
|
|
|
) &&
|
2007-07-25 00:43:09 +04:00
|
|
|
(echo one; echo two; echo four) > conflict &&
|
|
|
|
git add conflict &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git rebase --continue &&
|
2007-07-25 00:43:09 +04:00
|
|
|
echo resolved > conflict &&
|
|
|
|
git add conflict &&
|
|
|
|
git rebase --continue &&
|
|
|
|
test $one = $(git rev-parse HEAD~2)
|
|
|
|
'
|
|
|
|
|
2007-08-23 12:55:41 +04:00
|
|
|
test_expect_success 'interrupted squash works as expected (case 2)' '
|
2010-01-14 08:54:56 +03:00
|
|
|
git checkout -b interrupted-squash2 conflict-branch &&
|
2007-08-23 12:55:41 +04:00
|
|
|
one=$(git rev-parse HEAD~3) &&
|
2008-06-22 03:55:50 +04:00
|
|
|
(
|
|
|
|
FAKE_LINES="3 squash 1 2" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i HEAD~3
|
|
|
|
) &&
|
2007-08-23 12:55:41 +04:00
|
|
|
(echo one; echo four) > conflict &&
|
|
|
|
git add conflict &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git rebase --continue &&
|
2007-08-23 12:55:41 +04:00
|
|
|
(echo one; echo two; echo four) > conflict &&
|
|
|
|
git add conflict &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git rebase --continue &&
|
2007-08-23 12:55:41 +04:00
|
|
|
echo resolved > conflict &&
|
|
|
|
git add conflict &&
|
|
|
|
git rebase --continue &&
|
|
|
|
test $one = $(git rev-parse HEAD~2)
|
|
|
|
'
|
|
|
|
|
2007-08-01 18:59:35 +04:00
|
|
|
test_expect_success 'ignore patch if in upstream' '
|
|
|
|
HEAD=$(git rev-parse HEAD) &&
|
|
|
|
git checkout -b has-cherry-picked HEAD^ &&
|
|
|
|
echo unrelated > file7 &&
|
|
|
|
git add file7 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "unrelated change" &&
|
|
|
|
git cherry-pick $HEAD &&
|
|
|
|
EXPECT_COUNT=1 git rebase -i $HEAD &&
|
|
|
|
test $HEAD = $(git rev-parse HEAD^)
|
|
|
|
'
|
|
|
|
|
2007-09-25 19:42:36 +04:00
|
|
|
test_expect_success '--continue tries to commit, even for "edit"' '
|
|
|
|
parent=$(git rev-parse HEAD^) &&
|
|
|
|
test_tick &&
|
|
|
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
|
|
|
echo edited > file7 &&
|
|
|
|
git add file7 &&
|
|
|
|
FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
|
|
|
|
test edited = $(git show HEAD:file7) &&
|
|
|
|
git show HEAD | grep chouette &&
|
|
|
|
test $parent = $(git rev-parse HEAD^)
|
|
|
|
'
|
|
|
|
|
2009-01-15 15:56:15 +03:00
|
|
|
test_expect_success 'aborted --continue does not squash commits after "edit"' '
|
|
|
|
old=$(git rev-parse HEAD) &&
|
|
|
|
test_tick &&
|
|
|
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
|
|
|
echo "edited again" > file7 &&
|
|
|
|
git add file7 &&
|
|
|
|
(
|
|
|
|
FAKE_COMMIT_MESSAGE=" " &&
|
|
|
|
export FAKE_COMMIT_MESSAGE &&
|
|
|
|
test_must_fail git rebase --continue
|
|
|
|
) &&
|
|
|
|
test $old = $(git rev-parse HEAD) &&
|
|
|
|
git rebase --abort
|
|
|
|
'
|
|
|
|
|
2009-01-15 15:56:16 +03:00
|
|
|
test_expect_success 'auto-amend only edited commits after "edit"' '
|
|
|
|
test_tick &&
|
|
|
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
|
|
|
echo "edited again" > file7 &&
|
|
|
|
git add file7 &&
|
|
|
|
FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
|
|
|
|
echo "and again" > file7 &&
|
|
|
|
git add file7 &&
|
|
|
|
test_tick &&
|
|
|
|
(
|
|
|
|
FAKE_COMMIT_MESSAGE="and again" &&
|
|
|
|
export FAKE_COMMIT_MESSAGE &&
|
|
|
|
test_must_fail git rebase --continue
|
|
|
|
) &&
|
|
|
|
git rebase --abort
|
|
|
|
'
|
|
|
|
|
2011-08-24 18:01:48 +04:00
|
|
|
test_expect_success 'clean error after failed "exec"' '
|
|
|
|
test_tick &&
|
|
|
|
test_when_finished "git rebase --abort || :" &&
|
|
|
|
(
|
|
|
|
FAKE_LINES="1 exec_false" &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i HEAD^
|
|
|
|
) &&
|
|
|
|
echo "edited again" > file7 &&
|
|
|
|
git add file7 &&
|
|
|
|
test_must_fail git rebase --continue 2>error &&
|
|
|
|
grep "You have staged changes in your working tree." error
|
|
|
|
'
|
|
|
|
|
2007-09-25 19:43:15 +04:00
|
|
|
test_expect_success 'rebase a detached HEAD' '
|
|
|
|
grandparent=$(git rev-parse HEAD~2) &&
|
|
|
|
git checkout $(git rev-parse HEAD) &&
|
|
|
|
test_tick &&
|
|
|
|
FAKE_LINES="2 1" git rebase -i HEAD~2 &&
|
|
|
|
test $grandparent = $(git rev-parse HEAD~2)
|
|
|
|
'
|
|
|
|
|
2008-01-28 19:33:28 +03:00
|
|
|
test_expect_success 'rebase a commit violating pre-commit' '
|
|
|
|
|
|
|
|
mkdir -p .git/hooks &&
|
|
|
|
PRE_COMMIT=.git/hooks/pre-commit &&
|
|
|
|
echo "#!/bin/sh" > $PRE_COMMIT &&
|
|
|
|
echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
|
|
|
|
chmod a+x $PRE_COMMIT &&
|
|
|
|
echo "monde! " >> file1 &&
|
|
|
|
test_tick &&
|
2008-06-22 03:55:50 +04:00
|
|
|
test_must_fail git commit -m doesnt-verify file1 &&
|
2008-01-28 19:33:28 +03:00
|
|
|
git commit -m doesnt-verify --no-verify file1 &&
|
|
|
|
test_tick &&
|
|
|
|
FAKE_LINES=2 git rebase -i HEAD~2
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-02-14 00:13:21 +03:00
|
|
|
test_expect_success 'rebase with a file named HEAD in worktree' '
|
|
|
|
|
|
|
|
rm -fr .git/hooks &&
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout -b branch3 A &&
|
|
|
|
|
|
|
|
(
|
|
|
|
GIT_AUTHOR_NAME="Squashed Away" &&
|
|
|
|
export GIT_AUTHOR_NAME &&
|
|
|
|
>HEAD &&
|
|
|
|
git add HEAD &&
|
|
|
|
git commit -m "Add head" &&
|
|
|
|
>BODY &&
|
|
|
|
git add BODY &&
|
|
|
|
git commit -m "Add body"
|
|
|
|
) &&
|
|
|
|
|
|
|
|
FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
|
|
|
|
test "$(git show -s --pretty=format:%an)" = "Squashed Away"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-10-10 15:42:12 +04:00
|
|
|
test_expect_success 'do "noop" when there is nothing to cherry-pick' '
|
|
|
|
|
|
|
|
git checkout -b branch4 HEAD &&
|
|
|
|
GIT_EDITOR=: git commit --amend \
|
2010-10-31 10:30:58 +03:00
|
|
|
--author="Somebody else <somebody@else.com>" &&
|
2008-10-10 15:42:12 +04:00
|
|
|
test $(git rev-parse branch3) != $(git rev-parse branch4) &&
|
|
|
|
git rebase -i branch3 &&
|
|
|
|
test $(git rev-parse branch3) = $(git rev-parse branch4)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2009-01-27 12:07:31 +03:00
|
|
|
test_expect_success 'submodule rebase setup' '
|
|
|
|
git checkout A &&
|
|
|
|
mkdir sub &&
|
|
|
|
(
|
|
|
|
cd sub && git init && >elif &&
|
|
|
|
git add elif && git commit -m "submodule initial"
|
|
|
|
) &&
|
|
|
|
echo 1 >file1 &&
|
2010-10-31 10:30:58 +03:00
|
|
|
git add file1 sub &&
|
2009-01-27 12:07:31 +03:00
|
|
|
test_tick &&
|
|
|
|
git commit -m "One" &&
|
|
|
|
echo 2 >file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m "Two" &&
|
|
|
|
(
|
|
|
|
cd sub && echo 3 >elif &&
|
|
|
|
git commit -a -m "submodule second"
|
|
|
|
) &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m "Three changes submodule"
|
|
|
|
'
|
|
|
|
|
2009-01-27 14:42:31 +03:00
|
|
|
test_expect_success 'submodule rebase -i' '
|
2009-01-27 12:07:31 +03:00
|
|
|
FAKE_LINES="1 squash 2 3" git rebase -i A
|
|
|
|
'
|
|
|
|
|
2012-04-07 14:20:53 +04:00
|
|
|
test_expect_success 'submodule conflict setup' '
|
|
|
|
git tag submodule-base &&
|
|
|
|
git checkout HEAD^ &&
|
|
|
|
(
|
|
|
|
cd sub && git checkout HEAD^ && echo 4 >elif &&
|
|
|
|
git add elif && git commit -m "submodule conflict"
|
|
|
|
) &&
|
|
|
|
git add sub &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Conflict in submodule" &&
|
|
|
|
git tag submodule-topic
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -i continue with only submodule staged' '
|
|
|
|
test_must_fail git rebase -i submodule-base &&
|
|
|
|
git add sub &&
|
|
|
|
git rebase --continue &&
|
|
|
|
test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -i continue with unstaged submodule' '
|
|
|
|
git checkout submodule-topic &&
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git rebase -i submodule-base &&
|
|
|
|
git reset &&
|
|
|
|
git rebase --continue &&
|
|
|
|
test $(git rev-parse submodule-base) = $(git rev-parse HEAD)
|
|
|
|
'
|
|
|
|
|
2009-03-03 12:55:31 +03:00
|
|
|
test_expect_success 'avoid unnecessary reset' '
|
|
|
|
git checkout master &&
|
2012-04-07 14:20:53 +04:00
|
|
|
git reset --hard &&
|
2009-03-03 12:55:31 +03:00
|
|
|
test-chmtime =123456789 file3 &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
HEAD=$(git rev-parse HEAD) &&
|
|
|
|
git rebase -i HEAD~4 &&
|
|
|
|
test $HEAD = $(git rev-parse HEAD) &&
|
|
|
|
MTIME=$(test-chmtime -v +0 file3 | sed 's/[^0-9].*$//') &&
|
|
|
|
test 123456789 = $MTIME
|
|
|
|
'
|
|
|
|
|
2009-10-07 10:13:23 +04:00
|
|
|
test_expect_success 'reword' '
|
|
|
|
git checkout -b reword-branch master &&
|
|
|
|
FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
|
|
|
|
git show HEAD | grep "E changed" &&
|
|
|
|
test $(git rev-parse master) != $(git rev-parse HEAD) &&
|
|
|
|
test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
|
|
|
|
FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
|
|
|
|
git show HEAD^ | grep "D changed" &&
|
|
|
|
FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
|
|
|
|
git show HEAD~3 | grep "B changed" &&
|
|
|
|
FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
|
|
|
|
git show HEAD~2 | grep "C changed"
|
|
|
|
'
|
|
|
|
|
2010-03-12 20:04:33 +03:00
|
|
|
test_expect_success 'rebase -i can copy notes' '
|
|
|
|
git config notes.rewrite.rebase true &&
|
|
|
|
git config notes.rewriteRef "refs/notes/*" &&
|
|
|
|
test_commit n1 &&
|
|
|
|
test_commit n2 &&
|
|
|
|
test_commit n3 &&
|
|
|
|
git notes add -m"a note" n3 &&
|
|
|
|
git rebase --onto n1 n2 &&
|
|
|
|
test "a note" = "$(git notes show HEAD)"
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
an earlier note
|
2010-11-10 00:49:44 +03:00
|
|
|
|
2010-03-12 20:04:33 +03:00
|
|
|
a note
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'rebase -i can copy notes over a fixup' '
|
|
|
|
git reset --hard n3 &&
|
|
|
|
git notes add -m"an earlier note" n2 &&
|
|
|
|
GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 fixup 2" git rebase -i n1 &&
|
|
|
|
git notes show > output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
2010-03-15 07:48:22 +03:00
|
|
|
test_expect_success 'rebase while detaching HEAD' '
|
|
|
|
git symbolic-ref HEAD &&
|
|
|
|
grandparent=$(git rev-parse HEAD~2) &&
|
|
|
|
test_tick &&
|
|
|
|
FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 &&
|
|
|
|
test $grandparent = $(git rev-parse HEAD~2) &&
|
|
|
|
test_must_fail git symbolic-ref HEAD
|
|
|
|
'
|
|
|
|
|
2010-03-24 23:34:04 +03:00
|
|
|
test_tick # Ensure that the rebased commits get a different timestamp.
|
|
|
|
test_expect_success 'always cherry-pick with --no-ff' '
|
|
|
|
git checkout no-ff-branch &&
|
|
|
|
git tag original-no-ff-branch &&
|
|
|
|
git rebase -i --no-ff A &&
|
|
|
|
touch empty &&
|
|
|
|
for p in 0 1 2
|
|
|
|
do
|
|
|
|
test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
|
|
|
|
git diff HEAD~$p original-no-ff-branch~$p > out &&
|
|
|
|
test_cmp empty out
|
|
|
|
done &&
|
|
|
|
test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) &&
|
|
|
|
git diff HEAD~3 original-no-ff-branch~3 > out &&
|
|
|
|
test_cmp empty out
|
|
|
|
'
|
|
|
|
|
2010-07-06 10:08:36 +04:00
|
|
|
test_expect_success 'set up commits with funny messages' '
|
|
|
|
git checkout -b funny A &&
|
|
|
|
echo >>file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m "end with slash\\" &&
|
|
|
|
echo >>file1 &&
|
|
|
|
test_tick &&
|
2010-07-22 23:15:11 +04:00
|
|
|
git commit -a -m "something (\000) that looks like octal" &&
|
|
|
|
echo >>file1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m "something (\n) that looks like a newline" &&
|
|
|
|
echo >>file1 &&
|
|
|
|
test_tick &&
|
2010-07-06 10:08:36 +04:00
|
|
|
git commit -a -m "another commit"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase-i history with funny messages' '
|
|
|
|
git rev-list A..funny >expect &&
|
|
|
|
test_tick &&
|
2010-07-22 23:15:11 +04:00
|
|
|
FAKE_LINES="1 2 3 4" git rebase -i A &&
|
2010-07-06 10:08:36 +04:00
|
|
|
git rev-list A.. >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2007-06-25 04:11:14 +04:00
|
|
|
test_done
|