summaryrefslogtreecommitdiff
path: root/builtin/prune.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-06 06:50:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-06 06:50:18 (GMT)
commitea100b6dcba03053baed5a1e20c1a2644957b02e (patch)
tree9a1f02da22c743c835d3d5fc6cb678d61891992c /builtin/prune.c
parenta5ab66ee5f36fa3e90955f36f6451b3cf67943ed (diff)
parent5dcfbf564c0f10869e568af4e05421f63b44fbbf (diff)
downloadgit-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 'builtin/prune.c')
-rw-r--r--builtin/prune.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune.c b/builtin/prune.c
index 41230f8..1ec9ddd 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -161,7 +161,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
free(s);
if (is_repository_shallow(the_repository))
- prune_shallow(show_only);
+ prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);
return 0;
}