git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3f680ff)
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
authorElijah Newren <redacted>
Fri, 12 Aug 2011 05:20:25 +0000 (23:20 -0600)
committerJunio C Hamano <redacted>
Sun, 14 Aug 2011 21:19:40 +0000 (14:19 -0700)
commitf53d39778cf41cc93aa140bb41bb7d3a6590e179
tree9f2759c063dba3f84c6642a41db735d08fb751d2tree | snapshot
parent3f680ff0cf41c80b5c3a7ef4e7b417c0aa788dfbcommit | diff
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages

Calling update_stages() before update_file() can sometimes result in git
thinking the file being updated is untracked (whenever update_stages
moves it to stage 3).  Reverse the call order, and add a big comment to
update_stages to hopefully prevent others from making the same mistake.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
t/t6022-merge-rename.sh diff | blob | history
git clone https://git.99rst.org/PROJECT