fast-import: Fix argument order to die in file_change_m
The arguments to the "Not a blob" die call in file_change_m were transposed, so that the command was printed as the type, and the type as the command. Switch them around so that the error message comes out correctly. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Julian Phillips committed
Oct 20, 2007 at 17:15 UTC
2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4
1 file changed
+1
-1
fast-import.c
+1
-1
@@ -1859,7 +1859,7 @@ static void file_change_m(struct branch *b)
1859
} else if (oe) {
1860
if (oe->type != OBJ_BLOB)
1861
die("Not a blob (actually a %s): %s",
1862
- command_buf.buf, typename(oe->type));
1862
+ typename(oe->type), command_buf.buf);
1863
} else {
1864
enum object_type type = sha1_object_info(sha1, NULL);
1865
if (type < 0)