@matheusbsbs / matheus-bagliano / commits / 2f8acdb38e
Fork 0

core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Mar 20, 2006 at 18:45 UTC 2f8acdb38e513e4b983209563faf4c1d38c4013e
4 files changed +27 -3
cache.h
+1
@@ -165,6 +165,7 @@ extern void rollback_index_file(struct cache_file *);
165 extern int trust_executable_bit;
166 extern int assume_unchanged;
167 extern int only_use_symrefs;
168 +extern int warn_ambiguous_refs;
169 extern int diff_rename_limit_default;
170 extern int shared_repository;
171 extern const char *apply_default_whitespace;
config.c
+5
@@ -232,6 +232,11 @@ int git_default_config(const char *var, const char *value)
232 return 0;
233 }
234
235 + if (!strcmp(var, "core.warnambiguousrefs")) {
236 + warn_ambiguous_refs = git_config_bool(var, value);
237 + return 0;
238 + }
239 +
240 if (!strcmp(var, "user.name")) {
241 strncpy(git_default_name, value, sizeof(git_default_name));
242 return 0;
environment.c
+1
@@ -14,6 +14,7 @@ char git_default_name[MAX_GITNAME];
14 int trust_executable_bit = 1;
15 int assume_unchanged = 0;
16 int only_use_symrefs = 0;
17 +int warn_ambiguous_refs = 0;
18 int repository_format_version = 0;
19 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
20 int shared_repository = 0;
sha1_name.c
+20 -3
@@ -240,9 +240,13 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
240 "refs",
241 "refs/tags",
242 "refs/heads",
243 + "refs/remotes",
244 NULL
245 };
246 const char **p;
247 + const char *warning = "warning: refname '%.*s' is ambiguous.\n";
248 + char *pathname;
249 + int already_found = 0;
250
251 if (len == 40 && !get_sha1_hex(str, sha1))
252 return 0;
@@ -252,10 +256,23 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
256 return -1;
257
258 for (p = prefix; *p; p++) {
255 - char *pathname = git_path("%s/%.*s", *p, len, str);
256 - if (!read_ref(pathname, sha1))
257 - return 0;
259 + unsigned char sha1_from_ref[20];
260 + unsigned char *this_result =
261 + already_found ? sha1_from_ref : sha1;
262 + pathname = git_path("%s/%.*s", *p, len, str);
263 + if (!read_ref(pathname, this_result)) {
264 + if (warn_ambiguous_refs) {
265 + if (already_found &&
266 + !memcmp(sha1, sha1_from_ref, 20))
267 + fprintf(stderr, warning, len, str);
268 + already_found++;
269 + }
270 + else
271 + return 0;
272 + }
273 }
274 + if (already_found)
275 + return 0;
276 return -1;
277 }
278