diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-08 02:44:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-08 03:02:11 -0800 |
| commit | 8d78b5af2376be533ed11b53b292bdf0f2e6173b (patch) | |
| tree | e25e771069784f38b419c07981f6462a520bad61 | |
| parent | git-checkout: safety when coming back from the detached HEAD state. (diff) | |
| download | tgif-8d78b5af2376be533ed11b53b292bdf0f2e6173b.tar.xz | |
git-checkout: fix branch name output from the command
When switching branches with "git checkout", we internally did $arg^0
(aka $arg^{commit}) suffix but there was no need to.
The improvement is easily visible in the change to an existing
test t/3200-branch.sh in this commit; it was expecting rather
ugly message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-checkout.sh | 2 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 69d0c1c43a..a309bf0a1a 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -53,7 +53,7 @@ while [ "$#" != "0" ]; do exit 1 fi new="$rev" - new_name="$arg^0" + new_name="$arg" if git-show-ref --verify --quiet -- "refs/heads/$arg" then branch="$arg" diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index a6ea0f6a19..bb80e4286a 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -48,7 +48,7 @@ test_expect_success \ test ! -f .git/logs/refs/heads/d/e/f' cat >expect <<EOF -0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 checkout: Created from master^0 +0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 checkout: Created from master EOF test_expect_success \ 'git checkout -b g/h/i -l should create a branch and a log' \ |