mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +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>
123 lines
3.4 KiB
Bash
Executable file
123 lines
3.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='messages from rebase operation'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit O fileO &&
|
|
test_commit X fileX &&
|
|
test_commit A fileA &&
|
|
test_commit B fileB &&
|
|
test_commit Y fileY &&
|
|
|
|
git checkout -b topic O &&
|
|
git cherry-pick A B &&
|
|
test_commit Z fileZ &&
|
|
git tag start
|
|
'
|
|
|
|
test_expect_success 'rebase -m' '
|
|
git rebase -m master >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'rebase against master twice' '
|
|
git rebase --apply master >out &&
|
|
test_i18ngrep "Current branch topic is up to date" out
|
|
'
|
|
|
|
test_expect_success 'rebase against master twice with --force' '
|
|
git rebase --force-rebase --apply master >out &&
|
|
test_i18ngrep "Current branch topic is up to date, rebase forced" out
|
|
'
|
|
|
|
test_expect_success 'rebase against master twice from another branch' '
|
|
git checkout topic^ &&
|
|
git rebase --apply master topic >out &&
|
|
test_i18ngrep "Current branch topic is up to date" out
|
|
'
|
|
|
|
test_expect_success 'rebase fast-forward to master' '
|
|
git checkout topic^ &&
|
|
git rebase --apply topic >out &&
|
|
test_i18ngrep "Fast-forwarded HEAD to topic" out
|
|
'
|
|
|
|
test_expect_success 'rebase --stat' '
|
|
git reset --hard start &&
|
|
git rebase --stat master >diffstat.txt &&
|
|
grep "^ fileX | *1 +$" diffstat.txt
|
|
'
|
|
|
|
test_expect_success 'rebase w/config rebase.stat' '
|
|
git reset --hard start &&
|
|
git config rebase.stat true &&
|
|
git rebase master >diffstat.txt &&
|
|
grep "^ fileX | *1 +$" diffstat.txt
|
|
'
|
|
|
|
test_expect_success 'rebase -n overrides config rebase.stat config' '
|
|
git reset --hard start &&
|
|
git config rebase.stat true &&
|
|
git rebase -n master >diffstat.txt &&
|
|
! grep "^ fileX | *1 +$" diffstat.txt
|
|
'
|
|
|
|
# Output to stderr:
|
|
#
|
|
# "Does not point to a valid commit: invalid-ref"
|
|
#
|
|
# NEEDSWORK: This "grep" is fine in real non-C locales, but
|
|
# GIT_TEST_GETTEXT_POISON poisons the refname along with the enclosing
|
|
# error message.
|
|
test_expect_success 'rebase --onto outputs the invalid ref' '
|
|
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
|
|
test_i18ngrep "invalid-ref" err
|
|
'
|
|
|
|
test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
|
|
test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
|
|
test_i18ngrep "numerical value" err &&
|
|
test_must_fail git rebase --whitespace=bad HEAD 2>err &&
|
|
test_i18ngrep "Invalid whitespace option" err
|
|
'
|
|
|
|
test_expect_success 'GIT_REFLOG_ACTION' '
|
|
git checkout start &&
|
|
test_commit reflog-onto &&
|
|
git checkout -b reflog-topic start &&
|
|
test_commit reflog-to-rebase &&
|
|
|
|
git rebase --apply reflog-onto &&
|
|
git log -g --format=%gs -3 >actual &&
|
|
cat >expect <<-\EOF &&
|
|
rebase finished: returning to refs/heads/reflog-topic
|
|
rebase: reflog-to-rebase
|
|
rebase: checkout reflog-onto
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
git checkout -b reflog-prefix reflog-to-rebase &&
|
|
GIT_REFLOG_ACTION=change-the-reflog git rebase --apply reflog-onto &&
|
|
git log -g --format=%gs -3 >actual &&
|
|
cat >expect <<-\EOF &&
|
|
rebase finished: returning to refs/heads/reflog-prefix
|
|
change-the-reflog: reflog-to-rebase
|
|
change-the-reflog: checkout reflog-onto
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rebase -i onto unrelated history' '
|
|
git init unrelated &&
|
|
test_commit -C unrelated 1 &&
|
|
git -C unrelated remote add -f origin "$PWD" &&
|
|
git -C unrelated branch --set-upstream-to=origin/master &&
|
|
git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
|
|
test_i18ngrep "Changes to " actual &&
|
|
test_i18ngrep "5 files changed" actual
|
|
'
|
|
|
|
test_done
|