Browse Source

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>
maint
Julian Phillips 17 years ago committed by Shawn O. Pearce
parent
commit
2005dbe2a4
  1. 2
      fast-import.c

2
fast-import.c

@ -1859,7 +1859,7 @@ static void file_change_m(struct branch *b) @@ -1859,7 +1859,7 @@ static void file_change_m(struct branch *b)
} else if (oe) {
if (oe->type != OBJ_BLOB)
die("Not a blob (actually a %s): %s",
command_buf.buf, typename(oe->type));
typename(oe->type), command_buf.buf);
} else {
enum object_type type = sha1_object_info(sha1, NULL);
if (type < 0)

Loading…
Cancel
Save