Merge branch 'jc/mv'

* jc/mv:
  Allow git-mv to accept ./ in paths.

1 files changed, 9 insertions, 0 deletions

diff --git a/git-mv.perl b/git-mv.perl
index 83dc7e45cf..2ea852c918 100755
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -75,6 +75,15 @@ while(scalar @srcArgs > 0) {
     $dst = shift @dstArgs;
     $bad = "";
 
+    for ($src, $dst) {
+	# Be nicer to end-users by doing ".//a/./b/.//./c" ==> "a/b/c"
+	s|^\./||;
+	s|/\./|/| while (m|/\./|);
+	s|//+|/|g;
+	# Also "a/b/../c" ==> "a/c"
+	1 while (s,(^|/)[^/]+/\.\./,$1,);
+    }
+
     if ($opt_v) {
 	print "Checking rename of '$src' to '$dst'\n";
     }