From 5d9737b9e4b6eb43cba0548c80c13a69b231cfe7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 23 Oct 2010 08:06:23 -0700 Subject: [PATCH] Let deny.currentBranch=updateInstead ignore submodules They are not affected by the update anyway. Signed-off-by: Johannes Schindelin --- builtin/receive-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 1b2bf5fe66..b648c14a86 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -420,7 +420,7 @@ static void refuse_unconfigured_deny_delete_current(void) static void merge_worktree(unsigned char *sha1) { const char *update_refresh[] = { - "update-index", "--refresh", NULL + "update-index", "--ignore-submodules", "--refresh", NULL }; const char *read_tree[] = { "read-tree", "-u", "-m", sha1_to_hex(sha1), NULL -- 2.11.4.GIT