summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorJosef Weidendorfer <Josef.Weidendorfer@gmx.de>2006-03-01 18:09:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-01 20:13:46 (GMT)
commit9e7c73de0bcd410d12f897b19419dd35accd961e (patch)
tree252aaf76a11eb038821874a30d4292a518ffdb8b /git-merge-stupid.sh
parent5e6f85f6c1d988d125dfcba16bb43a9a65f9eab3 (diff)
downloadgit-9e7c73de0bcd410d12f897b19419dd35accd961e.zip
git-9e7c73de0bcd410d12f897b19419dd35accd961e.tar.gz
git-9e7c73de0bcd410d12f897b19419dd35accd961e.tar.bz2
git-mv: fixes for path handling
Moving a directory ending in a slash was not working as the destination was not calculated correctly. E.g. in the git repo, git-mv t/ Documentation gave the error Error: destination 'Documentation' already exists To get rid of this problem, strip trailing slashes from all arguments. The comment in cg-mv made me curious about this issue; Pasky, thanks! As result, the workaround in cg-mv is not needed any more. Also, another bug was shown by cg-mv. When moving files outside of a subdirectory, it typically calls git-mv with something like git-mv Documentation/git.txt Documentation/../git-mv.txt which triggers the following error from git-update-index: Ignoring path Documentation/../git-mv.txt The result is a moved file, removed from git revisioning, but not added again. To fix this, the paths have to be normalized not have ".." in the middle. This was already done in git-mv, but only for a better visual appearance :( Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions