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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Sep 28, 2015 at 16:01 UTC
14886b40c552d3ad4d5492d922948d76762af198
2 files changed
+8
-2
reachable.c
+7
-1
@@ -24,9 +24,15 @@ static void update_progress(struct connectivity_progress *cp)
24
25
static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
26
{
27
- struct object *object = parse_object_or_die(sha1, path);
27
struct rev_info *revs = (struct rev_info *)cb_data;
28
+ struct object *object;
29
30
+ if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) {
31
+ warning("symbolic ref is dangling: %s", path);
32
+ return 0;
33
+ }
34
+
35
+ object = parse_object_or_die(sha1, path);
36
add_pending_object(revs, object, "");
37
38
return 0;
t/t6500-gc.sh
+1
-1
@@ -30,7 +30,7 @@ test_expect_success 'gc -h with invalid configuration' '
30
test_i18ngrep "[Uu]sage" broken/usage
31
'
32
33
-test_expect_failure 'gc is not aborted due to a stale symref' '
33
+test_expect_success 'gc is not aborted due to a stale symref' '
34
git init remote &&
35
(
36
cd remote &&