summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJulian Phillips <julian@quantumfyre.co.uk>2007-10-20 16:15:38 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-21 01:43:35 (GMT)
commit2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4 (patch)
tree12cf80efc23a26729e4e46ca6219ce8d051a201f /fast-import.c
parent1d5bf7fcee6122931bd04c97269d64f8f282ec55 (diff)
downloadgit-2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4.zip
git-2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4.tar.gz
git-2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4.tar.bz2
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>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 078079d..c07e3d8 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)