diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-20 15:22:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-20 15:22:42 -0700 |
| commit | b05c2f9ed48adfd9670b28ecdd5c55a4e4698704 (patch) | |
| tree | 6392e6bbfc2cf79e3e8a9b3cac10149310e94226 | |
| parent | Merge branch 'rd/test-path-utils' into maint (diff) | |
| parent | pack-objects: do not get distracted by broken symrefs (diff) | |
| download | tgif-b05c2f9ed48adfd9670b28ecdd5c55a4e4698704.tar.xz | |
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
| -rw-r--r-- | reachable.c | 8 | ||||
| -rwxr-xr-x | t/t6500-gc.sh | 13 |
2 files changed, 20 insertions, 1 deletions
diff --git a/reachable.c b/reachable.c index 9cff25b490..43616d49c7 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; diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 63194d819e..5d7d414617 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -30,4 +30,17 @@ test_expect_success 'gc -h with invalid configuration' ' test_i18ngrep "[Uu]sage" broken/usage ' +test_expect_success 'gc is not aborted due to a stale symref' ' + git init remote && + ( + cd remote && + test_commit initial && + git clone . ../client && + git branch -m develop && + cd ../client && + git fetch --prune && + git gc + ) +' + test_done |