| commit | f59aac47f3839367d0da04019b0fc2bd61345225 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sun, 30 Jul 2006 16:35:21 +0000 (30 18:35 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 30 Jul 2006 21:23:00 +0000 (30 14:23 -0700) | ||
| tree | c60498c9bb8288133e219a1b6112235ed71fe7b9 | treesnapshot (tar.gz zip) |
| parent | a060b803b49c04cd6e3b0d859f131349dab6b26f | commitdiff |
merge-recur: fix thinko in unique_path()
This could result in a nasty infinite loop, or in bogus names (it used
the strlen() of the newly allocated buffer instead of the original
buffer).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This could result in a nasty infinite loop, or in bogus names (it used
the strlen() of the newly allocated buffer instead of the original
buffer).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |