diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-30 20:35:21 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-31 01:23:00 +0400 |
| commit | f59aac47f3839367d0da04019b0fc2bd61345225 (patch) | |
| tree | c60498c9bb8288133e219a1b6112235ed71fe7b9 /git-merge.sh | |
| parent | a060b803b49c04cd6e3b0d859f131349dab6b26f (diff) | |
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>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions