diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 14:17:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 14:31:30 -0800 |
| commit | af82559b435aa2a18f38a4f47a93729c8dc543d3 (patch) | |
| tree | 1b778e52a005cdd96b3f59c6439c88a9ec83e0f8 /t | |
| parent | 30c9e919b6ef33b0427a3ad784ed9e951ea48648 (diff) | |
| download | git-af82559b435aa2a18f38a4f47a93729c8dc543d3.tar.gz git-af82559b435aa2a18f38a4f47a93729c8dc543d3.tar.xz | |
git-mv: fix moving more than one source to a single destination
The code used as if return value from basename(3) were stable, but
often the function is implemented to return a pointer to a static
storage internal to it.
Because basename(3) is also allowed to modify its input parameter in
place, casting constness away from the strings we obtained from the
caller and giving them to basename is a no-no.
Reported, and initial fix and test supplied by David Rydh.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 10b8f8c44..65a35d94a 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -189,6 +189,18 @@ test_expect_success 'absolute pathname outside should fail' '( )' +test_expect_success 'git mv to move multiple sources into a directory' ' + rm -fr .git && git init && + mkdir dir other && + >dir/a.txt && + >dir/b.txt && + git add dir/?.txt && + git mv dir/a.txt dir/b.txt other && + git ls-files >actual && + { echo other/a.txt; echo other/b.txt; } >expect && + test_cmp expect actual +' + test_expect_success 'git mv should not change sha1 of moved cache entry' ' rm -fr .git && |