From: Junio C Hamano Date: Wed, 13 May 2020 19:19:18 +0000 (-0700) Subject: Merge branch 'tb/shallow-cleanup' X-Git-Tag: v2.27.0-rc0~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=896833b2687ce09a4965e5b4f3992daad096a65b;p=thirdparty%2Fgit.git Merge branch 'tb/shallow-cleanup' Code cleanup. * tb/shallow-cleanup: shallow: use struct 'shallow_lock' for additional safety shallow.h: document '{commit,rollback}_shallow_file' shallow: extract a header file for shallow-related functions commit: make 'commit_graft_pos' non-static --- 896833b2687ce09a4965e5b4f3992daad096a65b diff --cc builtin/prune.c index fd9acc7222,028ff786d6..02c6ab7cba --- a/builtin/prune.c +++ b/builtin/prune.c @@@ -6,8 -6,8 +6,9 @@@ #include "reachable.h" #include "parse-options.h" #include "progress.h" +#include "prune-packed.h" #include "object-store.h" + #include "shallow.h" static const char * const prune_usage[] = { N_("git prune [-n] [-v] [--progress] [--expire