diff options
author | Johannes Sixt <j6t@kdbg.org> | 2009-02-07 16:08:30 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-07 12:23:30 -0800 |
commit | f42302b49333d035a323f5d80fb9562d375b17f1 (patch) | |
tree | 2003fd4dd304aec98199cce60c0fe40aaefa2c2c /git-gui/lib/merge.tcl | |
parent | Fix GIT_CEILING_DIRECTORIES on Windows (diff) | |
download | tgif-f42302b49333d035a323f5d80fb9562d375b17f1.tar.xz |
Test and fix normalize_path_copy()
This changes the test-path-utils utility to invoke normalize_path_copy()
instead of normalize_absolute_path() because the latter is about to be
removed.
The test cases in t0060 are adjusted in two regards:
- normalize_path_copy() more often leaves a trailing slash in the result.
This has no negative side effects because the new user of this function,
longest_ancester_length(), already accounts for this behavior.
- The function can fail.
The tests uncover a flaw in normalize_path_copy(): If there are
sufficiently many '..' path components so that the root is reached, such as
in "/d1/s1/../../d2", then the leading slash was lost. This manifested
itself that (assuming there is a repository at /tmp/foo)
$ git add /d1/../tmp/foo/some-file
reported 'pathspec is outside repository'. This is now fixed.
Moreover, the test case descriptions of t0060 now include the test data and
expected outcome.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions