Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS

Ævar Arnfjörð Bjarmason committed about 4 years ago

ls-files: update test style

Li Linchao committed about 4 years ago

merge-ort: fix issue with dual rename and add/add conflict

Elijah Newren committed about 4 years ago

merge-ort: shuffle the computation and cleanup of potential collisions

Elijah Newren committed about 4 years ago

merge-ort: make a separate function for freeing struct collisions

Elijah Newren committed about 4 years ago

merge-ort: small cleanups of check_for_directory_rename

Elijah Newren committed about 4 years ago

t6423: add tests of dual directory rename plus add/add conflict

Elijah Newren committed about 4 years ago

Git 2.37.1

Junio C Hamano committed about 4 years ago

Merge 'js/add-i-delete' into maint-2.37

Junio C Hamano committed about 4 years ago

A regression fix for 2.37

Junio C Hamano committed about 4 years ago

Merge branch 'js/add-i-delete'

Junio C Hamano committed about 4 years ago

mv: add check_dir_in_index() and solve general dir check issue

Shaoxuan Yuan committed about 4 years ago

mv: use flags mode for update_mode

Shaoxuan Yuan committed about 4 years ago

mv: check if <destination> exists in index to handle overwriting

Shaoxuan Yuan committed about 4 years ago

mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit

Shaoxuan Yuan committed about 4 years ago

mv: decouple if/else-if checks using goto

Shaoxuan Yuan committed about 4 years ago

mv: update sparsity after moving from out-of-cone to in-cone

Shaoxuan Yuan committed about 4 years ago

t1092: mv directory from out-of-cone to in-cone

Shaoxuan Yuan committed about 4 years ago

t7002: add tests for moving out-of-cone file/directory

Shaoxuan Yuan committed about 4 years ago

test-tool delta: fix a memory leak

Ævar Arnfjörð Bjarmason committed about 4 years ago