Let deny.currentBranch=updateInstead ignore submodules

They are not affected by the update anyway.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2010-10-23 08:06:23 -07:00
parent 9365204454
commit 5101676a79

View File

@@ -428,7 +428,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