Johannes Schindelin 2031427167 git add: respect core.filemode with unmerged entries ...

When a merge left unmerged entries, git add failed to pick up the
file mode from the index, when core.filemode == 0. If more than one
unmerged entry is there, the order of stage preference is 2, 1, 3.

Noticed by Johannes Sixt.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2007-07-01 13:26:05 -07:00

28 KiB

Raw Blame History

View Raw