Skip to content

Commit

Permalink
Warn use of "origin" when remotes/origin/HEAD is dangling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Feb 11, 2009
1 parent f8948e2 commit 057e713
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 4 additions & 2 deletions sha1_name.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions t/t5505-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 057e713

Please sign in to comment.