Let deny.currentBranch=updateInstead ignore submodules

dscho · kblees · commit af84456c054b · 2014-08-16T02:59:42.000+02:00
They are not affected by the update anyway.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
@@ -478,7 +478,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 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

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ static int update_shallow_ref(struct command cmd, struct shallow_info si)`
`478`	`478`	`static void merge_worktree(unsigned char *sha1)`
`479`	`479`	`{`
`480`	`480`	`const char *update_refresh[] = {`
`481`		`- "update-index", "--refresh", NULL`
	`481`	`+ "update-index", "--ignore-submodules", "--refresh", NULL`
`482`	`482`	`};`
`483`	`483`	`const char *read_tree[] = {`
`484`	`484`	`"read-tree", "-u", "-m", sha1_to_hex(sha1), NULL`