summaryrefslogtreecommitdiff
path: root/t/t1507-rev-parse-upstream.sh
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-04-14 07:54:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-15 21:24:36 (GMT)
commit9884e67f9d9b511592b981572cfbb30cc50aec61 (patch)
tree7d64b938cec139eadc25cd8bbf51b857d6fceec3 /t/t1507-rev-parse-upstream.sh
parent1b4aee94aaffd5e6fdf3020434b3fa6f0c5cfb2b (diff)
downloadgit-9884e67f9d9b511592b981572cfbb30cc50aec61.zip
git-9884e67f9d9b511592b981572cfbb30cc50aec61.tar.gz
git-9884e67f9d9b511592b981572cfbb30cc50aec61.tar.bz2
Provide branch name in error message when using @{u}
When using @{u} or @{upstream} it is common to omit the branch name, implying current branch. If the upstream is not configured, the error message was "No upstream branch found for ''". When resolving '@{u}', branch_get() is called, which almost always returns a description of a branch. This allows us to use a branch name in the error message, even if the user said something like '@{u}'. The only case when branch_get() returns NULL is when HEAD points to so something which is not a branch. Of course this also means that no upstream is configured, but it is better to directly say that HEAD does not point to a branch. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1507-rev-parse-upstream.sh')
-rwxr-xr-xt/t1507-rev-parse-upstream.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index c4981ba..2f4f0d1 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -134,7 +134,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
test_expect_success '@{u} error message when no upstream' '
cat >expect <<-EOF &&
- error: No upstream branch found for ${sq}${sq}
+ error: No upstream branch found for ${sq}master${sq}
fatal: Needed a single revision
EOF
test_must_fail git rev-parse --verify @{u} 2>actual &&
@@ -152,7 +152,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
test_expect_success '@{u} error message when not on a branch' '
cat >expect <<-EOF &&
- error: No upstream branch found for ${sq}${sq}
+ error: HEAD does not point to a branch
fatal: Needed a single revision
EOF
git checkout HEAD^0 &&