| commit | 655e8515f279c01f525745d443f509f97cd805ab | |
| author | Adeodato Simó <dato@net.com.org.es> | |
| Fri, 7 Mar 2008 20:22:17 +0000 (7 21:22 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 8 Mar 2008 18:46:10 +0000 (8 10:46 -0800) | ||
| tree | 7c315be248e1ed542366644ed9589754cb6dbf8b | treesnapshot (tar.gz zip) |
| parent | 972b9a85301e1576c0fb84555396015663a65452 | commitdiff |
Really make the LF after reset in fast-import optional
cmd_from() ends with a call to read_next_command(), which is needed
when using cmd_from() from commands where from is not the last element.
With reset, however, "from" is the last command, after which the flow
returns to the main loop, which calls read_next_command() again.
Because of this, always set unread_command_buf in cmd_reset_branch(),
even if cmd_from() was successful.
Add a test case for this in t9300-fast-import.sh.
Signed-off-by: Adeodato Simó <dato@net.com.org.es>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cmd_from() ends with a call to read_next_command(), which is needed
when using cmd_from() from commands where from is not the last element.
With reset, however, "from" is the last command, after which the flow
returns to the main loop, which calls read_next_command() again.
Because of this, always set unread_command_buf in cmd_reset_branch(),
even if cmd_from() was successful.
Add a test case for this in t9300-fast-import.sh.
Signed-off-by: Adeodato Simó <dato@net.com.org.es>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| fast-import.c | diffblobblamehistory | |
| t/t9300-fast-import.sh | diffblobblamehistory |