Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)

gitster · gitster · commit 971dfa195983 · 2008-03-07T00:14:43.000-08:00
When get_pathspec() was originally made absolute-path capable,
we botched the interface to it, without dying inside the function
when given a path that is outside the work tree, and made it the
responsibility of callers to check the condition in a roundabout
way.  This is made unnecessary with the previous patch.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-mv.c b/builtin-mv.c
@@ -19,7 +19,6 @@ 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;
@@ -33,11 +32,8 @@ 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 result;
+	return get_pathspec(prefix, result);
 }
 
 static void show_list(const char *label, struct path_list *list)

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