path: root/reachable.c
diff options
authorJunio C Hamano <>2015-10-20 22:22:41 (GMT)
committerJunio C Hamano <>2015-10-20 22:22:42 (GMT)
commitb05c2f9ed48adfd9670b28ecdd5c55a4e4698704 (patch)
tree6392e6bbfc2cf79e3e8a9b3cac10149310e94226 /reachable.c
parent3b7c49e9a3bbb2c2667465835fe73d623f63601e (diff)
parent14886b40c552d3ad4d5492d922948d76762af198 (diff)
Merge branch 'js/gc-with-stale-symref' into maint
"git gc" used to barf when a symbolic ref has gone dangling (e.g. the branch that used to be your upstream's default when you cloned from it is now gone, and you did "fetch --prune"). * js/gc-with-stale-symref: pack-objects: do not get distracted by broken symrefs gc: demonstrate failure with stale remote HEAD
Diffstat (limited to 'reachable.c')
1 files changed, 7 insertions, 1 deletions
diff --git a/reachable.c b/reachable.c
index 9cff25b..43616d4 100644
--- a/reachable.c
+++ b/reachable.c
@@ -25,9 +25,15 @@ static void update_progress(struct connectivity_progress *cp)
static int add_one_ref(const char *path, const struct object_id *oid,
int flag, void *cb_data)
- struct object *object = parse_object_or_die(oid->hash, 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(oid->hash, path);
add_pending_object(revs, object, "");
return 0;