merge-recursive: avoid spurious rename/rename conflict from dir renames

Elijah Newren committed over 8 years ago

directory rename detection: new testcases showcasing a pair of bugs

Elijah Newren committed over 8 years ago

merge-recursive: fix remaining directory rename + dirty overwrite cases

Elijah Newren committed over 8 years ago

merge-recursive: fix overwriting dirty files involved in renames

Elijah Newren committed over 8 years ago

merge-recursive: avoid clobbering untracked files with directory renames

Elijah Newren committed over 8 years ago

merge-recursive: apply necessary modifications for directory renames

Elijah Newren committed over 8 years ago

test_must_be_empty: make sure the file exists, not just empty

Junio C Hamano committed over 8 years ago

t1507-rev-parse-upstream: don't check the stderr of a shell function

SZEDER Gábor committed over 8 years ago

t: add means to disable '-x' tracing for individual test scripts

SZEDER Gábor committed over 8 years ago

t: prevent '-x' tracing from interfering with test helpers' stderr

SZEDER Gábor committed over 8 years ago

Fifth batch for 2.17

Junio C Hamano committed over 8 years ago

Sync with maint

Junio C Hamano committed over 8 years ago

Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'sb/submodule-update-reset-fix' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'ab/commit-m-with-fixup' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'nd/ita-wt-renames-in-status' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'jt/binsearch-with-fanout'

Junio C Hamano committed over 8 years ago

Merge branch 'rd/typofix'

Junio C Hamano committed over 8 years ago

Merge branch 'jk/test-hashmap-updates'

Junio C Hamano committed over 8 years ago

Merge branch 'jk/sq-dequote-on-bogus-input'

Junio C Hamano committed over 8 years ago