sequencer: always roll back lock in `do_recursive_merge()`

Martin Ågren committed over 8 years ago

sequencer: make lockfiles non-static

Martin Ågren committed over 8 years ago

sha1_name: fix uninitialized memory errors

Derrick Stolee committed over 8 years ago

docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'

Mårten Kongstad committed over 8 years ago

merge-recursive: ensure we write updates for directory-renamed file

Elijah Newren committed over 8 years ago

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