diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-23 02:37:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-23 02:48:09 -0700 |
| commit | abba9dbbf450d4037a5e2054250f197169ac63eb (patch) | |
| tree | 3eef9d90cba419ef34d88929b6a7ab8b2f33ca81 | |
| parent | a17c4101003dbadc13d404a5dd5d106de1e57a3a (diff) | |
| download | git-abba9dbbf450d4037a5e2054250f197169ac63eb.tar.gz git-abba9dbbf450d4037a5e2054250f197169ac63eb.tar.xz | |
checkout: report where the new HEAD is upon detaching HEAD
After "git reset" moves the HEAD around, it reports which commit
you are on, which gives the user a warm fuzzy feeling of
assurance. Give the same assurance from git-checkout when
moving the detached HEAD around.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-checkout.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 3c9b1bb05..a7390e808 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -163,6 +163,13 @@ cd_to_toplevel detached= detach_warn= +describe_detached_head () { + test -n "$quiet" || { + printf >&2 "$1 " + GIT_PAGER= git log >&2 -1 --pretty=oneline --abbrev-commit "$2" + } +} + if test -z "$branch$newbranch" && test "$new" != "$old" then detached="$new" @@ -173,9 +180,9 @@ If you want to create a new branch from this checkout, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b <new_branch_name>" fi -elif test -z "$oldbranch" && test -z "$quiet" +elif test -z "$oldbranch" then - echo >&2 "Previous HEAD position was $old" + describe_detached_head 'Previous HEAD position was' "$old" fi if [ "X$old" = X ] @@ -275,6 +282,7 @@ if [ "$?" -eq 0 ]; then then echo >&2 "$detach_warn" fi + describe_detached_head 'HEAD is now at' HEAD fi rm -f "$GIT_DIR/MERGE_HEAD" else |