From: Julian Phillips <julian@quantumfyre.co.uk>
Date: Sat, 20 Oct 2007 16:15:38 +0000 (+0100)
Subject: fast-import: Fix argument order to die in file_change_m
X-Git-Tag: v1.5.3.5~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4;p=git.git

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>
---

diff --git a/fast-import.c b/fast-import.c
index 078079d40..c07e3d8ef 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -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)