| commit | 542c264b01ac551dca0697d6577ec71ad4c245ab | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Mar 2008 08:26:23 +0000 (10 01:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Mar 2008 08:26:23 +0000 (10 01:26 -0700) | ||
| tree | 0fe387cfcce0b0b8c6d2c37d25d6cfb715808d03 | treesnapshot (tar.gz zip) |
| parent | 1caeacc1f2973cecf7919a141adc4759acae94d0 | commitdiff |
traverse_trees_recursive(): propagate merge errors up
There were few places where merge errors detected deeper in the call chain
were ignored and not propagated up the callchain to the caller.
Most notably, this caused switching branches with "git checkout" to ignore
a path modified in a work tree are different between the HEAD version and
the commit being switched to, which it internally notices but ignores it,
resulting in an incorrect two-way merge and loss of the change in the work
tree.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There were few places where merge errors detected deeper in the call chain
were ignored and not propagated up the callchain to the caller.
Most notably, this caused switching branches with "git checkout" to ignore
a path modified in a work tree are different between the HEAD version and
the commit being switched to, which it internally notices but ignores it,
resulting in an incorrect two-way merge and loss of the change in the work
tree.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| unpack-trees.c | diffblobblamehistory |