When a branch and tag have the same name, a git-checkout using that name
succeeds (exits zero without complaining), switches to the _branch_, but
updates the working directory contents to that specified by the _tag_.
git-status show modified files.
Looks like the ambiguity issue was brought up last year, and git is now
*supposed* to warn when it encounters an ambiguous name. I agree with
Petr, it should fail violently, preferably as Josef Weidendorfer
suggests also printing out the ambiguous matches so the user can cut and
paste.
http://article.gmane.org/gmane.comp.version-control.git/17720
But it doesn't, git-checkout.sh redirects stderr on git-rev-parse
--verify so the message is lost. git-log complains, but most users will
never see it since it is pushed off the screen so quickly.
In another portion of the same thread Junio describes the caveats and
his experience:
http://article.gmane.org/gmane.comp.version-control.git/16996
The tag==branch name case is trivial to reproduce and a test script is
provided below. It should fail, so it's not really a submission as a
test script until this is fixed.
-brandon
ps. I was told a previous patch was ws munged. I'm using thunderbird, if
it happens this time suggestions welcome.
Signed-off-by: Brandon Casey <casey@xxxxxxxxxxxxxxx>
---
t/t2006-checkout-name-clash.sh | 39
+++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
create mode 100755 t/t2006-checkout-name-clash.sh
diff --git a/t/t2006-checkout-name-clash.sh b/t/t2006-checkout-name-clash.sh
new file mode 100755
index 0000000..2220578
--- /dev/null
+++ b/t/t2006-checkout-name-clash.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+test_description='git-checkout with tag/branch naming clash
+
+This tests whether git does something sane when a tag
+and a branch have the same name.'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+echo initial >file1 &&
+echo initial >file2 &&
+git-add file1 file2 &&
+git-commit -m initial
+'
+
+test_expect_success 'create modified branch named test' '
+git-branch test &&
+git-checkout test &&
+echo test >file1 &&
+git-commit -a -m test
+'
+
+test_expect_success 'create tag named test on master branch' '
+git-checkout master &&
+git-tag test
+'
+
+test_expect_success 'modify master and commit' '
+echo master >file2 &&
+git-commit -a -m master
+'
+
+test_expect_success 'checkout test and check consistency' '
+git-checkout test &&
+test "`git diff-index --name-only HEAD`" = ""
+'
+
+test_done
--
1.5.2.1.126.g6abd0
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
