summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 12:50:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 12:50:46 -0700
commit549ca8aa7ce73fa3d4d5daabc8929d09b92c4763 (patch)
tree3c98a07afad31265b01da6d226fa397a3d1e71d9 /commit.c
parentMerge branch 'sg/completion-zsh-workaround' (diff)
parentindex-pack: correct install_packed_git() args (diff)
downloadtgif-549ca8aa7ce73fa3d4d5daabc8929d09b92c4763.tar.xz
Merge branch 'jk/index-pack-maint'
"index-pack --strict" has been taught to make sure that it runs the final object integrity checks after making the freshly indexed packfile available to itself. * jk/index-pack-maint: index-pack: correct install_packed_git() args index-pack: handle --strict checks of non-repo packs prepare_commit_graft: treat non-repository as a noop
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/commit.c b/commit.c
index b0e57cc440..0030e79940 100644
--- a/commit.c
+++ b/commit.c
@@ -207,6 +207,9 @@ static void prepare_commit_graft(void)
if (commit_graft_prepared)
return;
+ if (!startup_info->have_repository)
+ return;
+
graft_file = get_graft_file();
read_graft_file(graft_file);
/* make sure shallows are read */