| commit | 208247adb9fc3702f87c6ec3fc26bd85d10d73e6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Nov 2010 01:52:36 +0000 (29 17:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Nov 2010 01:52:36 +0000 (29 17:52 -0800) | ||
| tree | 3b1a4d8e778d8733e9b70fd53e097d632d264040 | treesnapshot (tar.gz zip) |
| parent | 5acb623b72bde9ec96c48a8bb8f50e61371705ee | commitdiff |
| parent | 7980872d4ef3ce24329cbdb6d61dc2ed48cbf1c5 | commitdiff |
Merge branch 'cb/leading-path-removal'
* cb/leading-path-removal:
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Conflicts:
t/t7607-merge-overwrite.sh
* cb/leading-path-removal:
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Conflicts:
t/t7607-merge-overwrite.sh
| cache.h | diff1 | diff2 | blobhistory |
| t/t7607-merge-overwrite.sh | diff1 | diff2 | blobhistory |