summaryrefslogtreecommitdiff
path: root/t/t9300-fast-import.sh
diff options
context:
space:
mode:
authorAdeodato Simó <dato@net.com.org.es>2008-03-07 20:22:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-08 18:46:10 (GMT)
commit655e8515f279c01f525745d443f509f97cd805ab (patch)
tree7c315be248e1ed542366644ed9589754cb6dbf8b /t/t9300-fast-import.sh
parent972b9a85301e1576c0fb84555396015663a65452 (diff)
downloadgit-655e8515f279c01f525745d443f509f97cd805ab.zip
git-655e8515f279c01f525745d443f509f97cd805ab.tar.gz
git-655e8515f279c01f525745d443f509f97cd805ab.tar.bz2
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/t9300-fast-import.sh')
-rwxr-xr-xt/t9300-fast-import.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 0595041..142d42f 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