Re: git does the wrong thing with ambiguous names
From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Alex Riesen, Thu, Jun 07, 2007 00:58:26 +0200:
Brandon Casey, Thu, Jun 07, 2007 00:13:48 +0200:quoted
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.Bad. To reproduce: mkdir a && cd a && git init && :> a && git add . && git commit -m1 && :>b && git add . && git commit -m2 && git tag master HEAD^ && find .git/refs/ && gco -b new && gco master && git status
git-rev-parse actually warns about ambguities:
$ git-rev-parse --verify master
warning: refname 'master' is ambiguous.
dd5cdc387f2160bf04d02ac08dfdaf952f769357
It's just that the warning is thrown away in git-checkout.sh
A quick and _very_ messy fix could like like that:
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index 37addb2..3c3bc4e 100644
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c@@ -368,6 +368,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) show_datestring("--min-age=", arg+8); continue; } + if (!strcmp(arg, "--fail-ambiguous")) { + fail_ambiguous_refs = 1; + continue; + } if (show_flag(arg) && verify) die("Needed a single revision"); continue;
diff --git a/cache.h b/cache.h
index 8a9d1f3..4c532c6 100644
--- a/cache.h
+++ b/cache.h@@ -279,6 +279,7 @@ extern int assume_unchanged; extern int prefer_symlink_refs; extern int log_all_ref_updates; extern int warn_ambiguous_refs; +extern int fail_ambiguous_refs; extern int shared_repository; extern const char *apply_default_whitespace; extern int zlib_compression_level;
diff --git a/environment.c b/environment.c
index 9d3e5eb..872ab36 100644
--- a/environment.c
+++ b/environment.c@@ -18,6 +18,7 @@ int prefer_symlink_refs; int is_bare_repository_cfg = -1; /* unspecified */ int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; +int fail_ambiguous_refs = 0; int repository_format_version; const char *git_commit_encoding; const char *git_log_output_encoding;
diff --git a/git-checkout.sh b/git-checkout.sh
index 6b6facf..4c07fe5 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh@@ -57,6 +57,13 @@ while [ "$#" != "0" ]; do usage ;; *) + if ! git-rev-parse --verify --fail-ambiguous "$arg^0" \ + 2>/dev/null + then + echo >&2 "$arg is ambiguous" + find "$GIT_DIR/refs/" |grep -F "$arg"|sed -e 's|.git/| |' + exit 1 + fi if rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null) then if [ -z "$rev" ]; then
diff --git a/sha1_name.c b/sha1_name.c
index 7df01af..d094d41 100644
--- a/sha1_name.c
+++ b/sha1_name.c@@ -345,6 +345,10 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) if (warn_ambiguous_refs && refs_found > 1) fprintf(stderr, warning, len, str); + if (fail_ambiguous_refs && refs_found > 1) { + fprintf(stderr, "found %d refs\n", refs_found); + return -1; + } if (reflog_len) { int nth, i;