global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/fsck-reflog' into next

Browse Source 
* jc/fsck-reflog:
  reflog expire: do not punt on tags that point at non commits.
This commit is contained in:
Junio C Hamano
2006-12-23 01:30:43 -08:00
parent fddf1d2f0c 58748293f6
commit 389ed09e67
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-reflog.c
View File

@@ -80,7 +80,8 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
goto prune;
if ((timestamp < cb->expire_unreachable) &&
((old && !in_merge_bases(old, cb->ref_commit)) ||
(!cb->ref_commit ||
(old && !in_merge_bases(old, cb->ref_commit)) ||
(new && !in_merge_bases(new, cb->ref_commit))))
goto prune;
@@ -126,10 +127,9 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
}
cb.ref_commit = lookup_commit_reference_gently(sha1, 1);
if (!cb.ref_commit) {
status = error("ref '%s' does not point at a commit", ref);
goto finish;
}
if (!cb.ref_commit)
fprintf(stderr,
"warning: ref '%s' does not point at a commit\n", ref);
cb.ref = ref;
cb.expire_total = cmd->expire_total;
cb.expire_unreachable = cmd->expire_unreachable;