diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-06 06:50:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-06 06:50:18 (GMT) |
| commit | ea100b6dcba03053baed5a1e20c1a2644957b02e (patch) | |
| tree | 9a1f02da22c743c835d3d5fc6cb678d61891992c /commit.h | |
| parent | a5ab66ee5f36fa3e90955f36f6451b3cf67943ed (diff) | |
| parent | 5dcfbf564c0f10869e568af4e05421f63b44fbbf (diff) | |
| download | git-ea100b6dcba03053baed5a1e20c1a2644957b02e.zip git-ea100b6dcba03053baed5a1e20c1a2644957b02e.tar.gz git-ea100b6dcba03053baed5a1e20c1a2644957b02e.tar.bz2 | |
Merge branch 'js/shallow-and-fetch-prune'
"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
@@ -251,7 +251,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; extern int interactive_add(int argc, const char **argv, const char *prefix, int patch); |