diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-21 19:05:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 15:34:56 -0800 |
| commit | 288123f01cb1b835edbf6e2e188159c2ff858aca (patch) | |
| tree | c10efa0ec8474dc08928427134ad7116d3bee046 /xdiff/xmerge.c | |
| parent | merge-recursive: do not return NULL only to cause segfault (diff) | |
| download | tgif-288123f01cb1b835edbf6e2e188159c2ff858aca.tar.xz | |
ignore duplicated slashes in make_relative_path()
The function takes two paths, an early part of abs is supposed to match
base; otherwise abs is not a path under base and the function returns the
full path of abs. The caller can easily confuse the implementation by
giving duplicated and needless slashes in these path arguments.
Credit for test script, motivation and initial patch goes to Thomas Rast.
A follow-up fix (squashed) is by Hannes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions