mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
244ea1b5e4
Change the revision parsing logic to match @{upstream}, @{u} & @{push}
case-insensitively.
Before this change supplying anything except the lower-case forms
emits an "unknown revision or path not in the working tree"
error. This change makes upper-case & mixed-case versions equivalent
to the lower-case versions.
The use-case for this is being able to hold the shift key down while
typing @{u} on certain keyboard layouts, which makes the sequence
easier to type, and reduces cases where git throws an error at the
user where it could do what he means instead.
These suffixes now join various other suffixes & special syntax
documented in gitrevisions(7) that matches case-insensitively. A table
showing the status of the various forms documented there before &
after this patch is shown below. The key for the table is:
- CI = Case Insensitive
- CIP = Case Insensitive Possible (without ambiguities)
- AG = Accepts Garbage (.e.g. @{./.4.minutes./.})
Before this change:
|----------------+-----+------+-----|
| What? | CI? | CIP? | AG? |
|----------------+-----+------+-----|
| @{<date>} | Y | Y | Y |
| @{upstream} | N | Y | N |
| @{push} | N | Y | N |
|----------------+-----+------+-----|
After it:
|----------------+-----+------+-----|
| What? | CI? | CIP? | AG? |
|----------------+-----+------+-----|
| @{<date>} | Y | Y | Y |
| @{upstream} | Y | Y | N |
| @{push} | Y | Y | N |
|----------------+-----+------+-----|
The ^{<type>} suffix is not made case-insensitive, because other
places that take <type> like "cat-file -t <type>" do want them case
sensitively (after all we never declared that type names are case
insensitive). Allowing case-insensitive typename only with this syntax
will make the resulting Git as a whole inconsistent.
This change was independently authored to scratch a longtime itch, but
when I was about to submit it I discovered that a similar patch had
been submitted unsuccessfully before by Conrad Irwin in August 2011 as
"rev-parse: Allow @{U} as a synonym for
@{u}" (<1313287071-7851-1-git-send-email-conrad.irwin@gmail.com>).
The tests for this patch are more exhaustive than in the 2011
submission. The starting point for them was to first change the code
to only support upper-case versions of the existing words, seeing what
broke, and amending the breaking tests to check upper case & mixed
case as appropriate, and where not redundant to other similar
tests. The implementation itself is equivalent.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
258 lines
6.8 KiB
Bash
Executable File
258 lines
6.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test <branch>@{upstream} syntax'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit 1 &&
|
|
git checkout -b side &&
|
|
test_commit 2 &&
|
|
git checkout master &&
|
|
git clone . clone &&
|
|
test_commit 3 &&
|
|
(cd clone &&
|
|
test_commit 4 &&
|
|
git branch --track my-side origin/side &&
|
|
git branch --track local-master master &&
|
|
git branch --track fun@ny origin/side &&
|
|
git branch --track @funny origin/side &&
|
|
git branch --track funny@ origin/side &&
|
|
git remote add -t master master-only .. &&
|
|
git fetch master-only &&
|
|
git branch bad-upstream &&
|
|
git config branch.bad-upstream.remote master-only &&
|
|
git config branch.bad-upstream.merge refs/heads/side
|
|
)
|
|
'
|
|
|
|
sq="'"
|
|
|
|
full_name () {
|
|
(cd clone &&
|
|
git rev-parse --symbolic-full-name "$@")
|
|
}
|
|
|
|
commit_subject () {
|
|
(cd clone &&
|
|
git show -s --pretty=format:%s "$@")
|
|
}
|
|
|
|
error_message () {
|
|
(cd clone &&
|
|
test_must_fail git rev-parse --verify "$@")
|
|
}
|
|
|
|
test_expect_success '@{upstream} resolves to correct full name' '
|
|
test refs/remotes/origin/master = "$(full_name @{upstream})" &&
|
|
test refs/remotes/origin/master = "$(full_name @{UPSTREAM})" &&
|
|
test refs/remotes/origin/master = "$(full_name @{UpSTReam})"
|
|
'
|
|
|
|
test_expect_success '@{u} resolves to correct full name' '
|
|
test refs/remotes/origin/master = "$(full_name @{u})" &&
|
|
test refs/remotes/origin/master = "$(full_name @{U})"
|
|
'
|
|
|
|
test_expect_success 'my-side@{upstream} resolves to correct full name' '
|
|
test refs/remotes/origin/side = "$(full_name my-side@{u})"
|
|
'
|
|
|
|
test_expect_success 'upstream of branch with @ in middle' '
|
|
full_name fun@ny@{u} >actual &&
|
|
echo refs/remotes/origin/side >expect &&
|
|
test_cmp expect actual &&
|
|
full_name fun@ny@{U} >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'upstream of branch with @ at start' '
|
|
full_name @funny@{u} >actual &&
|
|
echo refs/remotes/origin/side >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'upstream of branch with @ at end' '
|
|
full_name funny@@{u} >actual &&
|
|
echo refs/remotes/origin/side >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' '
|
|
test_must_fail full_name refs/heads/my-side@{upstream}
|
|
'
|
|
|
|
test_expect_success 'my-side@{u} resolves to correct commit' '
|
|
git checkout side &&
|
|
test_commit 5 &&
|
|
(cd clone && git fetch) &&
|
|
test 2 = "$(commit_subject my-side)" &&
|
|
test 5 = "$(commit_subject my-side@{u})"
|
|
'
|
|
|
|
test_expect_success 'not-tracking@{u} fails' '
|
|
test_must_fail full_name non-tracking@{u} &&
|
|
(cd clone && git checkout --no-track -b non-tracking) &&
|
|
test_must_fail full_name non-tracking@{u}
|
|
'
|
|
|
|
test_expect_success '<branch>@{u}@{1} resolves correctly' '
|
|
test_commit 6 &&
|
|
(cd clone && git fetch) &&
|
|
test 5 = $(commit_subject my-side@{u}@{1}) &&
|
|
test 5 = $(commit_subject my-side@{U}@{1})
|
|
'
|
|
|
|
test_expect_success '@{u} without specifying branch fails on a detached HEAD' '
|
|
git checkout HEAD^0 &&
|
|
test_must_fail git rev-parse @{u} &&
|
|
test_must_fail git rev-parse @{U}
|
|
'
|
|
|
|
test_expect_success 'checkout -b new my-side@{u} forks from the same' '
|
|
(
|
|
cd clone &&
|
|
git checkout -b new my-side@{u} &&
|
|
git rev-parse --symbolic-full-name my-side@{u} >expect &&
|
|
git rev-parse --symbolic-full-name new@{u} >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'merge my-side@{u} records the correct name' '
|
|
(
|
|
cd clone || exit
|
|
git checkout master || exit
|
|
git branch -D new ;# can fail but is ok
|
|
git branch -t new my-side@{u} &&
|
|
git merge -s ours new@{u} &&
|
|
git show -s --pretty=tformat:%s >actual &&
|
|
echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'branch -d other@{u}' '
|
|
git checkout -t -b other master &&
|
|
git branch -d @{u} &&
|
|
git for-each-ref refs/heads/master >actual &&
|
|
>expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'checkout other@{u}' '
|
|
git branch -f master HEAD &&
|
|
git checkout -t -b another master &&
|
|
git checkout @{u} &&
|
|
git symbolic-ref HEAD >actual &&
|
|
echo refs/heads/master >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'branch@{u} works when tracking a local branch' '
|
|
test refs/heads/master = "$(full_name local-master@{u})"
|
|
'
|
|
|
|
test_expect_success 'branch@{u} error message when no upstream' '
|
|
cat >expect <<-EOF &&
|
|
fatal: no upstream configured for branch ${sq}non-tracking${sq}
|
|
EOF
|
|
error_message non-tracking@{u} 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success '@{u} error message when no upstream' '
|
|
cat >expect <<-EOF &&
|
|
fatal: no upstream configured for branch ${sq}master${sq}
|
|
EOF
|
|
test_must_fail git rev-parse --verify @{u} 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'branch@{u} error message with misspelt branch' '
|
|
cat >expect <<-EOF &&
|
|
fatal: no such branch: ${sq}no-such-branch${sq}
|
|
EOF
|
|
error_message no-such-branch@{u} 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success '@{u} error message when not on a branch' '
|
|
cat >expect <<-EOF &&
|
|
fatal: HEAD does not point to a branch
|
|
EOF
|
|
git checkout HEAD^0 &&
|
|
test_must_fail git rev-parse --verify @{u} 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'branch@{u} error message if upstream branch not fetched' '
|
|
cat >expect <<-EOF &&
|
|
fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
|
|
EOF
|
|
error_message bad-upstream@{u} 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'pull works when tracking a local branch' '
|
|
(
|
|
cd clone &&
|
|
git checkout local-master &&
|
|
git pull
|
|
)
|
|
'
|
|
|
|
# makes sense if the previous one succeeded
|
|
test_expect_success '@{u} works when tracking a local branch' '
|
|
test refs/heads/master = "$(full_name @{u})"
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
|
|
Reflog: master@{0} (C O Mitter <committer@example.com>)
|
|
Reflog message: branch: Created from HEAD
|
|
Author: A U Thor <author@example.com>
|
|
Date: Thu Apr 7 15:15:13 2005 -0700
|
|
|
|
3
|
|
EOF
|
|
test_expect_success 'log -g other@{u}' '
|
|
git log -1 -g other@{u} >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
|
|
Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
|
|
Reflog message: branch: Created from HEAD
|
|
Author: A U Thor <author@example.com>
|
|
Date: Thu Apr 7 15:15:13 2005 -0700
|
|
|
|
3
|
|
EOF
|
|
|
|
test_expect_success 'log -g other@{u}@{now}' '
|
|
git log -1 -g other@{u}@{now} >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '@{reflog}-parsing does not look beyond colon' '
|
|
echo content >@{yesterday} &&
|
|
git add @{yesterday} &&
|
|
git commit -m "funny reflog file" &&
|
|
git hash-object @{yesterday} >expect &&
|
|
git rev-parse HEAD:@{yesterday} >actual
|
|
'
|
|
|
|
test_expect_success '@{upstream}-parsing does not look beyond colon' '
|
|
echo content >@{upstream} &&
|
|
git add @{upstream} &&
|
|
git commit -m "funny upstream file" &&
|
|
git hash-object @{upstream} >expect &&
|
|
git rev-parse HEAD:@{upstream} >actual
|
|
'
|
|
|
|
test_done
|