mirror of
https://github.com/git/git.git
synced 2026-02-10 09:48:09 +00:00
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:
committed by
Karsten Blees
parent
f6ef373fb8
commit
af84456c05
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user