From: Junio C Hamano Date: Fri, 13 May 2011 17:41:54 +0000 (-0700) Subject: Merge branch 'jc/fix-diff-files-unmerged' into maint X-Git-Tag: v1.7.5.2~27 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a613b534bca2d56f2ad67b3a7f0cf2b34f031260;p=git.git Merge branch 'jc/fix-diff-files-unmerged' into maint * jc/fix-diff-files-unmerged: diff-files: show unmerged entries correctly diff: remove often unused parameters from diff_unmerge() diff.c: return filepair from diff_unmerge() test: use $_z40 from test-lib --- a613b534bca2d56f2ad67b3a7f0cf2b34f031260 diff --cc t/t3200-branch.sh index 286a2a686,4c4cff196..463ef1909 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@@ -223,14 -212,9 +223,14 @@@ test_expect_success 'branch from non-branch HEAD w/--track causes failure' \ 'test_must_fail git branch --track my10 HEAD^' +test_expect_success \ + 'branch from tag w/--track causes failure' \ + 'git tag foobar && + test_must_fail git branch --track my11 foobar' + # Keep this test last, as it changes the current branch cat >expect < 1117150200 +0000 branch: Created from master + $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master EOF test_expect_success \ 'git checkout -b g/h/i -l should create a branch and a log' \