From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 5/6] Warn use of "origin" when remotes/origin/HEAD is dangling
Date: Mon, 9 Feb 2009 01:09:24 -0800 [thread overview]
Message-ID: <1234170565-6740-6-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1234170565-6740-5-git-send-email-gitster@pobox.com>
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>
---
sha1_name.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 5d0ac02..3bd2ef0 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -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;
--
1.6.2.rc0.28.g2593d
next prev parent reply other threads:[~2009-02-09 9:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-07 15:27 Deleting the "current" branch in remote bare repositories Jan Krüger
2009-02-07 22:05 ` Felipe Contreras
2009-02-08 0:18 ` Jan Krüger
2009-02-08 8:44 ` Jeff King
2009-02-08 9:42 ` Junio C Hamano
2009-02-08 11:18 ` Jeff King
2009-02-08 19:05 ` Junio C Hamano
2009-02-09 9:09 ` [PATCH 0/6] Deleting the "current" branch in a remote repository Junio C Hamano
2009-02-09 9:09 ` [PATCH 1/6] builtin-receive-pack.c: do not initialize statics to 0 Junio C Hamano
2009-02-09 9:09 ` [PATCH 2/6] t5400: allow individual tests to fail Junio C Hamano
2009-02-09 9:09 ` [PATCH 3/6] receive-pack: receive.denyDeleteCurrent Junio C Hamano
2009-02-09 9:09 ` [PATCH 4/6] remote prune: warn dangling symrefs Junio C Hamano
2009-02-09 9:09 ` Junio C Hamano [this message]
2009-02-09 9:09 ` [PATCH 6/6] receive-pack: default receive.denyDeleteCurrent to refuse Junio C Hamano
2009-02-09 19:15 ` [PATCH 4/6] remote prune: warn dangling symrefs Jeff King
2009-02-11 17:30 ` Junio C Hamano
2009-02-11 18:35 ` Jeff King
2009-02-11 18:42 ` Jeff King
2009-02-09 18:53 ` [PATCH 3/6] receive-pack: receive.denyDeleteCurrent Jeff King
2009-02-09 19:22 ` Jeff King
2009-02-09 21:38 ` Junio C Hamano
2009-02-10 12:07 ` Jeff King
2009-02-10 15:15 ` Junio C Hamano
2009-02-09 18:46 ` [PATCH 2/6] t5400: allow individual tests to fail Jeff King
2009-02-09 19:08 ` Junio C Hamano
2009-02-09 21:39 ` Junio C Hamano
2009-02-10 12:01 ` Jeff King
2009-02-09 18:28 ` Deleting the "current" branch in remote bare repositories Jeff King
2009-02-09 18:36 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1234170565-6740-6-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).