builtin-mv: minimum fix to avoid losing files

gitster · gitster · commit 744dacd3f504 · 2008-02-05T00:44:10.000-08:00
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 &lt;gitster@pobox.com&gt;
diff --git a/builtin-mv.c b/builtin-mv.c
@@ -19,6 +19,7 @@ static const char **copy_pathspec(const char *prefix, const char **pathspec,
 				  int count, int base_name)
 {
 	int i;
+	int len = prefix ? strlen(prefix) : 0;
 	const char **result = xmalloc((count + 1) * sizeof(const char *));
 	memcpy(result, pathspec, count * sizeof(const char *));
 	result[count] = NULL;
@@ -32,8 +33,11 @@ static const char **copy_pathspec(const char *prefix, const char **pathspec,
 			if (last_slash)
 				result[i] = last_slash + 1;
 		}
+		result[i] = prefix_path(prefix, len, result[i]);
+		if (!result[i])
+			exit(1); /* error already given */
 	}
-	return get_pathspec(prefix, result);
+	return result;
 }
 
 static void show_list(const char *label, struct path_list *list)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
@@ -118,4 +118,42 @@ test_expect_success "Sergey Vlasov's test case" '
 	git mv ab a
 '
 
+test_expect_success 'absolute pathname' '(
+
+	rm -fr mine &&
+	mkdir mine &&
+	cd mine &&
+	test_create_repo one &&
+	cd one &&
+	mkdir sub &&
+	>sub/file &&
+	git add sub/file &&
+
+	git mv sub "$(pwd)/in" &&
+	! test -d sub &&
+	test -d in &&
+	git ls-files --error-unmatch in/file
+
+
+)'
+
+test_expect_success 'absolute pathname outside should fail' '(
+
+	rm -fr mine &&
+	mkdir mine &&
+	cd mine &&
+	out=$(pwd) &&
+	test_create_repo one &&
+	cd one &&
+	mkdir sub &&
+	>sub/file &&
+	git add sub/file &&
+
+	! git mv sub "$out/out" &&
+	test -d sub &&
+	! test -d ../in &&
+	git ls-files --error-unmatch sub/file
+
+)'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ static const char *copy_pathspec(const char prefix, const char **pathspec,`
`19`	`19`	`int count, int base_name)`
`20`	`20`	`{`
`21`	`21`	`int i;`
	`22`	`+ int len = prefix ? strlen(prefix) : 0;`
`22`	`23`	`const char *result = xmalloc((count + 1) sizeof(const char *));`
`23`	`24`	`memcpy(result, pathspec, count * sizeof(const char *));`
`24`	`25`	`result[count] = NULL;`
`@@ -32,8 +33,11 @@ static const char *copy_pathspec(const char prefix, const char **pathspec,`
`32`	`33`	`if (last_slash)`
`33`	`34`	`result[i] = last_slash + 1;`
`34`	`35`	`}`
	`36`	`+ result[i] = prefix_path(prefix, len, result[i]);`
	`37`	`+ if (!result[i])`
	`38`	`+ exit(1); /* error already given */`
`35`	`39`	`}`
`36`		`- return get_pathspec(prefix, result);`
	`40`	`+ return result;`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`static void show_list(const char label, struct path_list list)`