global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 22:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let deny.currentBranch=updateInstead ignore submodules

Browse Source 
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
committed by Pat Thoyts
parent 2b04d7695e
commit d73c3c04cf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/receive-pack.c
View File

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