diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-11 16:47:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-11 16:47:34 -0800 |
| commit | c388761c153bc3e874e75f69ff77430164c038c4 (patch) | |
| tree | caacf48f2cdb1878ec7f4fe03c957c6d482738b9 /t | |
| parent | 4d229653ab5eda48f7b7c83cb2a876b48a41ffd4 (diff) | |
| parent | bfbbb8f8cf8250718ffd028efe179557d29ae72d (diff) | |
| download | git-c388761c153bc3e874e75f69ff77430164c038c4.tar.gz git-c388761c153bc3e874e75f69ff77430164c038c4.tar.xz | |
Merge branch 'jc/detached-head'
* jc/detached-head:
git-checkout: handle local changes sanely when detaching HEAD
git-checkout: safety check for detached HEAD checks existing refs
git-checkout: fix branch name output from the command
git-checkout: safety when coming back from the detached HEAD state.
git-checkout: rewording comments regarding detached HEAD.
git-checkout: do not warn detaching HEAD when it is already detached.
Detached HEAD (experimental)
git-branch: show detached HEAD
git-status: show detached HEAD
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index a6ea0f6a1..bb80e4286 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' \ |