Skip to content

Commit

Permalink
fast-import: Fix argument order to die in file_change_m
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julian Phillips authored and Shawn O. Pearce committed Oct 21, 2007
1 parent 1d5bf7f commit 2005dbe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fast-import.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2005dbe

Please sign in to comment.