diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | 2f682e21a6dc3b7403fd0162252183fdef019274 (patch) | |
| tree | 7786c764e8bc53641337149f91818f5b919c5595 /t/t6046-merge-skip-unneeded-updates.sh | |
| parent | bd42380ef1ec773d1557b28ba6924f4020333143 (diff) | |
| download | git-2f682e21a6dc3b7403fd0162252183fdef019274.tar.gz | |
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
If a cherry-pick or merge with a rename results in a skippable update
(due to the merged content matching what HEAD already had), but the
working directory is dirty, avoid trying to refresh the index as that
will fail.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6046-merge-skip-unneeded-updates.sh')
0 files changed, 0 insertions, 0 deletions