diff options
| author |  Julian Phillips <julian@quantumfyre.co.uk> | 2007-10-20 17:15:38 +0100 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-20 21:43:35 -0400 |
| commit | 2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4 (patch) | |
| tree | 12cf80efc23a26729e4e46ca6219ce8d051a201f | |
| parent | gitk.txt: Fix markup. (diff) | |
| download | tgif-2005dbe2a4e3eba5ecddb7d3c46339d2bc1241d4.tar.xz | |
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>
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 078079d404..c07e3d8ef0 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) |