![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Dec 2010 16:57:38 +0000 (08:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Dec 2010 16:58:09 +0000 (08:58 -0800) | ||
| commit | e6b71b32892bf1600e7edaab17426f634e7e5e5a | |
| tree | f48d2e4be78744011599d5505642673077796743 | tree | snapshot |
| parent | 0137ef7dae553f9eb89cbae1ddb60b72046ba28b | commit | diff |
| parent | ada6a4117eb204fe14a83bc51daaf923cd8127ec | commit | diff |
Merge branch 'maint'
* maint:
Prepare for 1.7.3.4
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
Do not link with -lcrypto under NO_OPENSSL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
* maint:
Prepare for 1.7.3.4
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
Do not link with -lcrypto under NO_OPENSSL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/RelNotes/1.7.4.txt | diff1 | | | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |