diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:07:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:07:57 -0800 |
| commit | ad416ed433fdcf838916a84177fe9e810be19eff (patch) | |
| tree | dcba56533726b1e791b4c9ab8f44c7f8fd4a1b2e /fast-import.c | |
| parent | caa99829a24bc4decf86278c3478c88f564a795a (diff) | |
| parent | 56d5fe285583b5177ffc65dbe7df636ed5b8cc6b (diff) | |
| download | git-ad416ed433fdcf838916a84177fe9e810be19eff.tar.gz git-ad416ed433fdcf838916a84177fe9e810be19eff.tar.xz | |
Merge branch 'maint' to sync with 1.5.4.4
* maint:
GIT 1.5.4.4
ident.c: reword error message when the user name cannot be determined
Fix dcommit, rebase when rewriteRoot is in use
Really make the LF after reset in fast-import optional
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 7f197d5e3..655913ddb 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2291,7 +2291,8 @@ static void cmd_reset_branch(void) else b = new_branch(sp); read_next_command(); - if (!cmd_from(b) && command_buf.len > 0) + cmd_from(b); + if (command_buf.len > 0) unread_command_buf = 1; } |