From 14886b40c552d3ad4d5492d922948d76762af198 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 28 Sep 2015 16:01:25 +0200 Subject: pack-objects: do not get distracted by broken symrefs It is quite possible for, say, a remote HEAD to become broken, e.g. when the default branch was renamed. We should still be able to pack our objects when such a thing happens; simply ignore broken symrefs (because they cannot matter for the packing process anyway). This fixes https://github.com/git-for-windows/git/issues/423 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- reachable.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'reachable.c') diff --git a/reachable.c b/reachable.c index 69fa6851da..4cfd0dec70 100644 --- a/reachable.c +++ b/reachable.c @@ -24,9 +24,15 @@ static void update_progress(struct connectivity_progress *cp) static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) { - struct object *object = parse_object_or_die(sha1, path); struct rev_info *revs = (struct rev_info *)cb_data; + struct object *object; + if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) { + warning("symbolic ref is dangling: %s", path); + return 0; + } + + object = parse_object_or_die(sha1, path); add_pending_object(revs, object, ""); return 0; -- cgit v1.2.3