summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-08-16 00:13:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-16 18:15:41 (GMT)
commit2a6f08ac1f6949ed0072aed3240bc04d80051851 (patch)
tree44153da21a1f570db5e9d2322c97daee8cf6e380
parent0906f6e14e6e9df0c4ea4edb08ebe9f5d16c2391 (diff)
downloadgit-2a6f08ac1f6949ed0072aed3240bc04d80051851.zip
git-2a6f08ac1f6949ed0072aed3240bc04d80051851.tar.gz
git-2a6f08ac1f6949ed0072aed3240bc04d80051851.tar.bz2
am: refresh the index at start and --resolved
If a file is unchanged but stat-dirty, we may erroneously fail to apply patches, thinking that they conflict with a dirty working tree. This patch adds a call to "update-index --refresh". It comes as late as possible, so that we don't bother with it for thinks like "git rebase --abort", or when mbox-splitting fails. However, it does come before we actually start applying patches, meaning we will only call it once when we start applying patches (or any time we return to "am" after having resolved conflicts), and not once per patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-am.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 6cdd591..f1a03c9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -507,6 +507,8 @@ else
fi
fi
+git update-index -q --refresh
+
case "$resolved" in
'')
case "$HAS_HEAD" in