![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jul 2010 17:25:15 +0000 (10:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jul 2010 17:25:15 +0000 (10:25 -0700) | ||
| commit | 56bfacef7966553530532d58c07787754add2465 | |
| tree | 3e56ab8a4fe42fee53571fb6f7d5fee7ec19252e | tree | snapshot |
| parent | 765c22588d9e410bf0100c4991b1945134da6959 | commit | diff |
| parent | 0e71bc300432b9e63bdbc8e28b0c5c0fafb601fc | commit | diff |
Merge branch 'tr/receive-pack-aliased-update-fix' into maint
* tr/receive-pack-aliased-update-fix:
check_aliased_update: strcpy() instead of strcat() to copy
receive-pack: detect aliased updates which can occur with symrefs
receive-pack: switch global variable 'commands' to a parameter
Conflicts:
t/t5516-fetch-push.sh
* tr/receive-pack-aliased-update-fix:
check_aliased_update: strcpy() instead of strcat() to copy
receive-pack: detect aliased updates which can occur with symrefs
receive-pack: switch global variable 'commands' to a parameter
Conflicts:
t/t5516-fetch-push.sh
| builtin/receive-pack.c | diff1 | | | | blob | history |
| t/t5516-fetch-push.sh | diff1 | | diff2 | | blob | history |