This is a set of changes I was working on last Sept-Nov; these changes
are not ready for git.git (other than perhaps patches 1 and 5), but I
figured it might be useful to send anyway because (1) it might serve
as notification to others of various edge and corner case issues that
exist, and (2) the work won't die if my laptop harddrive does.
I'm expecting to clean these up, though it may take me a month or two
before I get the time.
(Note that patch 5 contains a subset of b9b3eef (merge-recursive:
tweak magic band-aid 2011-03-17); I could have saved Junio some time
if I had submitted that earlier, and had remembered that change
instead of propagating the mistake. Sorry about that.)
Most of what is included are new testcases exposing edge and corner
case bugs in merge-recursive that I found in a code audit, some of
which are marked as test_expect_success even though the test does not
succeed. There may be a few tests that are just cases I was testing
for completeness or that I was worried about breaking with planned
changes. I didn't try to figure out the right place to add all these
tests (we're out of space in the t60[23]x range and I wasn't sure if I
wanted to dump all of these into t6036), so I just named them
tempxx.sh.
Elijah Newren (10):
merge-recursive: Remove redundant check for removing rename source
Reminder to fix o->call_depth handling in conflict_rename_rename_1to2
A bunch of fixes and FIXMEs
Correct a comment
merge-recursive: Fix sorting order and directory change assumptions
Add a comment pointing out a bug
Good testcases
More test scripts
Tests and fixes associated with rename/rename conflicts
Add new testcase (temp14) showing how undetected renames can cause or
spuriously avoid merge conflicts
merge-recursive.c | 86 ++++++++++++++++++++++--------
t/t6020-merge-df.sh | 26 ++++++---
t/temp1.sh | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++
t/temp10.sh | 41 ++++++++++++++
t/temp11.sh | 41 ++++++++++++++
t/temp12.sh | 59 +++++++++++++++++++++
t/temp13.sh | 79 +++++++++++++++++++++++++++
t/temp14.sh | 63 ++++++++++++++++++++++
t/temp2.sh | 86 ++++++++++++++++++++++++++++++
t/temp3.sh | 72 +++++++++++++++++++++++++
t/temp4.sh | 96 +++++++++++++++++++++++++++++++++
t/temp5.sh | 35 ++++++++++++
t/temp50.sh | 38 +++++++++++++
t/temp6.sh | 55 +++++++++++++++++++
t/temp7.sh | 34 ++++++++++++
t/temp8.sh | 37 +++++++++++++
t/temp9.sh | 73 +++++++++++++++++++++++++
17 files changed, 1036 insertions(+), 31 deletions(-)
create mode 100644 t/temp1.sh
create mode 100755 t/temp10.sh
create mode 100755 t/temp11.sh
create mode 100755 t/temp12.sh
create mode 100755 t/temp13.sh
create mode 100755 t/temp14.sh
create mode 100755 t/temp2.sh
create mode 100755 t/temp3.sh
create mode 100755 t/temp4.sh
create mode 100755 t/temp5.sh
create mode 100755 t/temp50.sh
create mode 100755 t/temp6.sh
create mode 100755 t/temp7.sh
create mode 100755 t/temp8.sh
create mode 100755 t/temp9.sh
--
1.7.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html