undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warn use of "origin" when remotes/origin/HEAD is dangling

Browse Source 
The previous one squelched the diagnositic message we used to issue every
time we enumerated the refs and noticed a dangling ref.  This adds the
warning back to the place where the user actually attempts to use it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2009-02-08 23:52:01 -08:00
parent f8948e2fbc
commit 057e71384a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sha1_name.c
View File

@ -268,16 +268,18 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
char fullref[PATH_MAX];
unsigned char sha1_from_ref[20];
unsigned char *this_result;
int flag;
this_result = refs_found ? sha1_from_ref : sha1;
mksnpath(fullref, sizeof(fullref), *p, len, str);
r = resolve_ref(fullref, this_result, 1, NULL);
r = resolve_ref(fullref, this_result, 1, &flag);
if (r) {
if (!refs_found++)
*ref = xstrdup(r);
if (!warn_ambiguous_refs)
break;
}
} else if (flag & REF_ISSYMREF)
warning("ignoring dangling symref %s.", fullref);
}
free(last_branch);
return refs_found;

6
t/t5505-remote.sh
View File

@ -421,6 +421,12 @@ test_expect_success 'remote prune to cause a dangling symref' '
git branch -a
) 2>err &&
! grep "points nowhere" err
(
cd seven &&
test_must_fail git branch nomore origin
) 2>err &&
grep "dangling symref" err
'
test_done