diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:51 +0900 |
| commit | d0975a0724cc8f0f88931264b8b97c8a4c428dda (patch) | |
| tree | 9f78eb6e4070aeddb1488315fbcac313811c98d4 /commit.h | |
| parent | 7d483e9c00516413a9c2dafc24a6ecb40975b02b (diff) | |
| parent | 5dcfbf564c0f10869e568af4e05421f63b44fbbf (diff) | |
| download | git-d0975a0724cc8f0f88931264b8b97c8a4c428dda.tar.xz | |
Merge branch 'js/shallow-and-fetch-prune' into maint
"git repack" in a shallow clone did not correctly update the
shallow points in the repository, leading to a repository that
does not pass fsck.
* js/shallow-and-fetch-prune:
repack -ad: prune the list of shallow commits
shallow: offer to prune only non-existing entries
repack: point out a bug handling stale shallow info
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -256,7 +256,9 @@ extern void assign_shallow_commits_to_refs(struct shallow_info *info, uint32_t **used, int *ref_status); extern int delayed_reachability_test(struct shallow_info *si, int c); -extern void prune_shallow(int show_only); +#define PRUNE_SHOW_ONLY 1 +#define PRUNE_QUICK 2 +extern void prune_shallow(unsigned options); extern struct trace_key trace_shallow; int is_descendant_of(struct commit *, struct commit_list *); |