mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +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:
parent
9369839d7d
commit
308f835490
|
@ -401,7 +401,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
|
||||
|
|
Loading…
Reference in a new issue