mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
10cdb9f38a
Two related changes, with separate rationale for each:
Rename the 'interactive' backend to 'merge' because:
* 'interactive' as a name caused confusion; this backend has been used
for many kinds of non-interactive rebases, and will probably be used
in the future for more non-interactive rebases than interactive ones
given that we are making it the default.
* 'interactive' is not the underlying strategy; merging is.
* the directory where state is stored is not called
.git/rebase-interactive but .git/rebase-merge.
Rename the 'am' backend to 'apply' because:
* Few users are familiar with git-am as a reference point.
* Related to the above, the name 'am' makes sentences in the
documentation harder for users to read and comprehend (they may read
it as the verb from "I am"); avoiding this difficult places a large
burden on anyone writing documentation about this backend to be very
careful with quoting and sentence structure and often forces
annoying redundancy to try to avoid such problems.
* Users stumble over pronunciation ("am" as in "I am a person not a
backend" or "am" as in "the first and thirteenth letters in the
alphabet in order are "A-M"); this may drive confusion when one user
tries to explain to another what they are doing.
* While "am" is the tool driving this backend, the tool driving git-am
is git-apply, and since we are driving towards lower-level tools
for the naming of the merge backend we may as well do so here too.
* The directory where state is stored has never been called
.git/rebase-am, it was always called .git/rebase-apply.
For all the reasons listed above:
* Modify the documentation to refer to the backends with the new names
* Provide a brief note in the documentation connecting the new names
to the old names in case users run across the old names anywhere
(e.g. in old release notes or older versions of the documentation)
* Change the (new) --am command line flag to --apply
* Rename some enums, variables, and functions to reinforce the new
backend names for us as well.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
314 lines
9.2 KiB
Bash
Executable file
314 lines
9.2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2013 Ramkumar Ramachandra
|
|
#
|
|
|
|
test_description='git rebase --autostash tests'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo hello-world >file0 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m "initial commit" &&
|
|
git checkout -b feature-branch &&
|
|
echo another-hello >file1 &&
|
|
echo goodbye >file2 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m "second commit" &&
|
|
echo final-goodbye >file3 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m "third commit" &&
|
|
git checkout -b unrelated-onto-branch master &&
|
|
echo unrelated >file4 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m "unrelated commit" &&
|
|
git checkout -b related-onto-branch master &&
|
|
echo conflicting-change >file2 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m "related commit" &&
|
|
remove_progress_re="$(printf "s/.*\\r//")"
|
|
'
|
|
|
|
create_expected_success_apply () {
|
|
cat >expected <<-EOF
|
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
|
|
First, rewinding head to replay your work on top of it...
|
|
Applying: second commit
|
|
Applying: third commit
|
|
Applied autostash.
|
|
EOF
|
|
}
|
|
|
|
create_expected_success_merge () {
|
|
q_to_cr >expected <<-EOF
|
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
|
|
Applied autostash.
|
|
Successfully rebased and updated refs/heads/rebased-feature-branch.
|
|
EOF
|
|
}
|
|
|
|
create_expected_failure_apply () {
|
|
cat >expected <<-EOF
|
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
|
|
First, rewinding head to replay your work on top of it...
|
|
Applying: second commit
|
|
Applying: third commit
|
|
Applying autostash resulted in conflicts.
|
|
Your changes are safe in the stash.
|
|
You can run "git stash pop" or "git stash drop" at any time.
|
|
EOF
|
|
}
|
|
|
|
create_expected_failure_merge () {
|
|
cat >expected <<-EOF
|
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
|
|
Applying autostash resulted in conflicts.
|
|
Your changes are safe in the stash.
|
|
You can run "git stash pop" or "git stash drop" at any time.
|
|
Successfully rebased and updated refs/heads/rebased-feature-branch.
|
|
EOF
|
|
}
|
|
|
|
testrebase () {
|
|
type=$1
|
|
dotest=$2
|
|
|
|
test_expect_success "rebase$type: dirty worktree, --no-autostash" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
test_when_finished git checkout feature-branch &&
|
|
echo dirty >>file3 &&
|
|
test_must_fail git rebase$type --no-autostash unrelated-onto-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type: dirty worktree, non-conflicting rebase" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
echo dirty >>file3 &&
|
|
git rebase$type unrelated-onto-branch >actual 2>&1 &&
|
|
grep unrelated file4 &&
|
|
grep dirty file3 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type --autostash: check output" '
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
suffix=${type#\ --} && suffix=${suffix:-apply} &&
|
|
if test ${suffix} = "interactive"; then
|
|
suffix=merge
|
|
fi &&
|
|
create_expected_success_$suffix &&
|
|
sed "$remove_progress_re" <actual >actual2 &&
|
|
test_i18ncmp expected actual2
|
|
'
|
|
|
|
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
echo dirty >>file3 &&
|
|
git add file3 &&
|
|
git rebase$type unrelated-onto-branch &&
|
|
grep unrelated file4 &&
|
|
grep dirty file3 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type: conflicting rebase" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
echo dirty >>file3 &&
|
|
test_must_fail git rebase$type related-onto-branch &&
|
|
test_path_is_file $dotest/autostash &&
|
|
test_path_is_missing file3 &&
|
|
rm -rf $dotest &&
|
|
git reset --hard &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type: --continue" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
echo dirty >>file3 &&
|
|
test_must_fail git rebase$type related-onto-branch &&
|
|
test_path_is_file $dotest/autostash &&
|
|
test_path_is_missing file3 &&
|
|
echo "conflicting-plus-goodbye" >file2 &&
|
|
git add file2 &&
|
|
git rebase --continue &&
|
|
test_path_is_missing $dotest/autostash &&
|
|
grep dirty file3 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type: --skip" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
echo dirty >>file3 &&
|
|
test_must_fail git rebase$type related-onto-branch &&
|
|
test_path_is_file $dotest/autostash &&
|
|
test_path_is_missing file3 &&
|
|
git rebase --skip &&
|
|
test_path_is_missing $dotest/autostash &&
|
|
grep dirty file3 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type: --abort" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
echo dirty >>file3 &&
|
|
test_must_fail git rebase$type related-onto-branch &&
|
|
test_path_is_file $dotest/autostash &&
|
|
test_path_is_missing file3 &&
|
|
git rebase --abort &&
|
|
test_path_is_missing $dotest/autostash &&
|
|
grep dirty file3 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b rebased-feature-branch feature-branch &&
|
|
echo dirty >file4 &&
|
|
git add file4 &&
|
|
git rebase$type unrelated-onto-branch >actual 2>&1 &&
|
|
test_path_is_missing $dotest &&
|
|
git reset --hard &&
|
|
grep unrelated file4 &&
|
|
! grep dirty file4 &&
|
|
git checkout feature-branch &&
|
|
git stash pop &&
|
|
grep dirty file4
|
|
'
|
|
|
|
test_expect_success "rebase$type: check output with conflicting stash" '
|
|
test_when_finished git branch -D rebased-feature-branch &&
|
|
suffix=${type#\ --} && suffix=${suffix:-apply} &&
|
|
if test ${suffix} = "interactive"; then
|
|
suffix=merge
|
|
fi &&
|
|
create_expected_failure_$suffix &&
|
|
sed "$remove_progress_re" <actual >actual2 &&
|
|
test_i18ncmp expected actual2
|
|
'
|
|
}
|
|
|
|
test_expect_success "rebase: fast-forward rebase" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b behind-feature-branch feature-branch~1 &&
|
|
test_when_finished git branch -D behind-feature-branch &&
|
|
echo dirty >>file1 &&
|
|
git rebase feature-branch &&
|
|
grep dirty file1 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
test_expect_success "rebase: noop rebase" '
|
|
test_config rebase.autostash true &&
|
|
git reset --hard &&
|
|
git checkout -b same-feature-branch feature-branch &&
|
|
test_when_finished git branch -D same-feature-branch &&
|
|
echo dirty >>file1 &&
|
|
git rebase feature-branch &&
|
|
grep dirty file1 &&
|
|
git checkout feature-branch
|
|
'
|
|
|
|
testrebase " --apply" .git/rebase-apply
|
|
testrebase " --merge" .git/rebase-merge
|
|
testrebase " --interactive" .git/rebase-merge
|
|
|
|
test_expect_success 'abort rebase -i with --autostash' '
|
|
test_when_finished "git reset --hard" &&
|
|
echo uncommitted-content >file0 &&
|
|
(
|
|
write_script abort-editor.sh <<-\EOF &&
|
|
echo >"$1"
|
|
EOF
|
|
test_set_editor "$(pwd)/abort-editor.sh" &&
|
|
test_must_fail git rebase -i --autostash HEAD^ &&
|
|
rm -f abort-editor.sh
|
|
) &&
|
|
echo uncommitted-content >expected &&
|
|
test_cmp expected file0
|
|
'
|
|
|
|
test_expect_success 'restore autostash on editor failure' '
|
|
test_when_finished "git reset --hard" &&
|
|
echo uncommitted-content >file0 &&
|
|
(
|
|
test_set_editor "false" &&
|
|
test_must_fail git rebase -i --autostash HEAD^
|
|
) &&
|
|
echo uncommitted-content >expected &&
|
|
test_cmp expected file0
|
|
'
|
|
|
|
test_expect_success 'autostash is saved on editor failure with conflict' '
|
|
test_when_finished "git reset --hard" &&
|
|
echo uncommitted-content >file0 &&
|
|
(
|
|
write_script abort-editor.sh <<-\EOF &&
|
|
echo conflicting-content >file0
|
|
exit 1
|
|
EOF
|
|
test_set_editor "$(pwd)/abort-editor.sh" &&
|
|
test_must_fail git rebase -i --autostash HEAD^ &&
|
|
rm -f abort-editor.sh
|
|
) &&
|
|
echo conflicting-content >expected &&
|
|
test_cmp expected file0 &&
|
|
git checkout file0 &&
|
|
git stash pop &&
|
|
echo uncommitted-content >expected &&
|
|
test_cmp expected file0
|
|
'
|
|
|
|
test_expect_success 'autostash with dirty submodules' '
|
|
test_when_finished "git reset --hard && git checkout master" &&
|
|
git checkout -b with-submodule &&
|
|
git submodule add ./ sub &&
|
|
test_tick &&
|
|
git commit -m add-submodule &&
|
|
echo changed >sub/file0 &&
|
|
git rebase -i --autostash HEAD
|
|
'
|
|
|
|
test_expect_success 'branch is left alone when possible' '
|
|
git checkout -b unchanged-branch &&
|
|
echo changed >file0 &&
|
|
git rebase --autostash unchanged-branch &&
|
|
test changed = "$(cat file0)" &&
|
|
test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
|
|
'
|
|
|
|
test_expect_success 'never change active branch' '
|
|
git checkout -b not-the-feature-branch unrelated-onto-branch &&
|
|
test_when_finished "git reset --hard && git checkout master" &&
|
|
echo changed >file0 &&
|
|
git rebase --autostash not-the-feature-branch feature-branch &&
|
|
test_cmp_rev not-the-feature-branch unrelated-onto-branch
|
|
'
|
|
|
|
test_done
|