diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-16 12:08:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-16 12:08:27 -0700 |
| commit | 7a0e4d7c39083e951625e4c3434d05abfea8f5e6 (patch) | |
| tree | 599abe83d2366065e34df86e7a0ce4f4ceecbfd8 /t/t0022-crlf-rename.sh | |
| parent | diff A...B: give one possible diff when there are more than one merge-base (diff) | |
| download | tgif-7a0e4d7c39083e951625e4c3434d05abfea8f5e6.tar.xz | |
diff A...B: do not limit the syntax too narrowly
Earlier we tried to make sure that the trees we get are what A...B
syntax produced, by checking that earlier ones are all marked
uninteresting (which has to be true as they are merge bases),
there are two remaining ones that are interesting, and they are
marked as non-symmetric-left and symmetric-left respectively.
The "the last two must be interesting" condition is however wrong when one
is an ancestor of the other between A and B (i.e. fast-forward). In such
a case, one of them is marked uninteresting.
Diffstat (limited to 't/t0022-crlf-rename.sh')
0 files changed, 0 insertions, 0 deletions