summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-11-25 10:34:27 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-25 10:38:22 -0800
commitf0c4881facabc0aa76f4b51871bd70c45effb508 (patch)
tree7f93fbf508f56f717d55be612e9b460e0c124206
parentMerge branch 'rv/maint-index-commit' into maint (diff)
downloadtgif-f0c4881facabc0aa76f4b51871bd70c45effb508.tar.xz
git-checkout: describe detached head correctly
When you have a file called HEAD in the work tree, the code to report where the HEAD is at when "git checkout $commit^0" is done triggered unnecessary ambiguity checking. Explicitly mark the command line with "--" and make it clear that we are talking about a revision. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-checkout.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 17f43927aa..5ca71242e7 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -169,7 +169,7 @@ detach_warn=
describe_detached_head () {
test -n "$quiet" || {
printf >&2 "$1 "
- GIT_PAGER= git log >&2 -1 --pretty=oneline --abbrev-commit "$2"
+ GIT_PAGER= git log >&2 -1 --pretty=oneline --abbrev-commit "$2" --
}
}