From: Nicolas Morey-Chaisemartin Date: Thu, 17 Mar 2011 08:09:14 GMT Subject: [PATCH] git-submodule: Remove duplicate entries during merge with conflict Message-ID: <4D81C1AA.5010008@morey-chaisemartin.com> During a merge with conflict on a submodule, the submodule appears 3 times in git ls-files (stage 1,2,3) which causes the submodule to be used 3 times in git submodule update or status command. This patch filters the results of git ls-files and only shows submodule in stage 0 or 1 thus removing the duplicates. Signed-off-by: Nicolas Morey-Chaisemartin --- git-submodule.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 3a13397..5ef0f9d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -72,7 +72,7 @@ resolve_relative_url () # module_list() { - git ls-files --error-unmatch --stage -- "$@" | sane_grep '^160000 ' + git ls-files --error-unmatch --stage -- "$@" | sane_grep '^160000 ' | awk '{ if (($3 == 0) || ($3 == 1)) print $0}' } #