diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-03 23:59:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-05 00:44:10 -0800 |
| commit | 744dacd3f5045240a304e687f3ef7135398e7865 (patch) | |
| tree | 2f79230a6d792514f78c9344661158f1b6b19b5a /git-merge-resolve.sh | |
| parent | 1abf0950638d4f3279d059a1365da9c253d5718a (diff) | |
| download | git-744dacd3f5045240a304e687f3ef7135398e7865.tar.gz git-744dacd3f5045240a304e687f3ef7135398e7865.tar.xz | |
builtin-mv: minimum fix to avoid losing files
An incorrect command "git mv subdir /outer/space" threw the
subdirectory to outside of the repository and then noticed that
/outer/space/subdir/ would be outside of the repository. The
error checking is backwards.
This fixes the issue by being careful about use of the return
value of get_pathspec(). Since the implementation already has
handcrafted loop to munge each path on the command line, we use
prefix_path() instead.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions