diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:25 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:40 -0700 |
| commit | f53d39778cf41cc93aa140bb41bb7d3a6590e179 (patch) | |
| tree | 9f2759c063dba3f84c6642a41db735d08fb751d2 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | t6022: Add testcase for spurious "refusing to lose untracked" messages (diff) | |
| download | git-f53d39778cf41cc93aa140bb41bb7d3a6590e179.tar.gz git-f53d39778cf41cc93aa140bb41bb7d3a6590e179.zip | |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions