diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-09-28 16:01:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-08 12:42:06 -0700 |
| commit | 14886b40c552d3ad4d5492d922948d76762af198 (patch) | |
| tree | 9cc35d6373299ae26e6e37bdba01ec4c2688873b | |
| parent | 8c845cde99dcfc9821f1182623248dee9ebb4227 (diff) | |
| download | git-14886b40c552d3ad4d5492d922948d76762af198.tar.gz git-14886b40c552d3ad4d5492d922948d76762af198.tar.xz | |
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>
| -rw-r--r-- | reachable.c | 8 | ||||
| -rwxr-xr-x | t/t6500-gc.sh | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/reachable.c b/reachable.c index 69fa6851d..4cfd0dec7 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; diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index ed22dcc76..5d7d41461 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -30,7 +30,7 @@ test_expect_success 'gc -h with invalid configuration' ' test_i18ngrep "[Uu]sage" broken/usage ' -test_expect_failure 'gc is not aborted due to a stale symref' ' +test_expect_success 'gc is not aborted due to a stale symref' ' git init remote && ( cd remote && |