diff options
| -rw-r--r-- | fast-import.c | 3 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 9b71ccc47..32ec15991 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2261,7 +2261,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; } diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 0595041af..142d42f3b 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 |