path: root/fast-import.c
diff options
authorShawn O. Pearce <>2007-10-21 06:11:45 (GMT)
committerShawn O. Pearce <>2007-10-21 06:11:45 (GMT)
commit8a37e21dab1103e11630d091c13be21d958221c1 (patch)
tree0f6c085ec04678da3e267c8fab215359672697a1 /fast-import.c
parent538dfe7397db62e5c7e8861c272380140969a8b8 (diff)
parent2ee52eb17c26323b3f62538a44510aae75f09d6f (diff)
Merge branch 'maint'
* maint: Describe more fixes in release notes Fix diffcore-break total breakage Fix directory scanner to correctly ignore files without d_type Improve receive-pack error message about funny ref creation fast-import: Fix argument order to die in file_change_m git-gui: Don't display CR within console windows git-gui: Handle progress bars from newer gits git-gui: Correctly report failures from git-write-tree gitk.txt: Fix markup. send-pack: respect '+' on wildcard refspecs git-gui: accept versions containing text annotations, like 1.5.3.mingw.1 git-gui: Don't crash when starting gitk from a browser session git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs git-gui: Handle starting on mapped shares under Cygwin git-gui: Display message box when we cannot find git in $PATH git-gui: Avoid using bold text in entire gui for some fonts
Diffstat (limited to 'fast-import.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index e9c80be..6f888f6 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1817,7 +1817,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)