diff options
| author |  Adeodato Simó <dato@net.com.org.es> | 2008-03-07 21:22:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-08 10:46:10 -0800 |
| commit | 655e8515f279c01f525745d443f509f97cd805ab (patch) | |
| tree | 7c315be248e1ed542366644ed9589754cb6dbf8b /t | |
| parent | Merge branch 'mh/maint-http-proxy-fix' into maint (diff) | |
| download | tgif-655e8515f279c01f525745d443f509f97cd805ab.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 0595041af5..142d42f3b3 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -869,6 +869,8 @@ zcommits COMMIT reset refs/tags/O3-2nd from :5 +reset refs/tags/O3-3rd +from :5 INPUT_END cat >expect <<INPUT_END |