Re: [PATCH] Really make the LF after reset in fast-import optional

From: Shawn O. Pearce <spearce@spearce.org>
Date: Mar 8, 2008, 02:12 UTC
Message-ID: <20080308021210.GX8410@spearce.org>
In-Reply-To: <1204921337-5204-1-git-send-email-dato@net.com.org.es>

Adeodato Sim <dato@net.com.org.es> wrote:

Show 12 quoted lines

> 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>

Heh, this is awesome. I got busy for a day and someone fixed my bug for me. Thanks. :-)

Acked-by: Shawn O. Pearce <spearce@spearce.org>

>  fast-import.c          |    3 ++-
>  t/t9300-fast-import.sh |    2 ++
>  2 files changed, 4 insertions(+), 1 deletions(-)

-- 
Shawn.