From: Christian Couder Date: Fri, 28 Aug 2009 04:47:37 GMT Subject: [PATCH v4 07/15] sequencer: add "do_fast_forward()" to perform a fast forward Message-ID: <20090828044746.4307.88217.chriscool@tuxfamily.org> In-Reply-To: <20090828043913.4307.34708.chriscool@tuxfamily.org> From: Stephan Beyer This function is a thin wrapper around "reset_almost_hard()". It is usefull because it will help reduce a little the shell code line count. This code is taken from the sequencer GSoC project: git://repo.or.cz/git/sbeyer.git (at commit 5a78908b70ceb5a4ea9fd4b82f07ceba1f019079) but the messages have been changed a little to be the same as those displayed by "git-rebase--interactive.sh". Mentored-by: Daniel Barkalow Mentored-by: Christian Couder Signed-off-by: Stephan Beyer Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin-sequencer--helper.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/builtin-sequencer--helper.c b/builtin-sequencer--helper.c index be030bc..0cd7e98 100644 --- a/builtin-sequencer--helper.c +++ b/builtin-sequencer--helper.c @@ -171,6 +171,15 @@ static struct commit *get_commit(const char *arg) return lookup_commit_reference(sha1); } +static int do_fast_forward(const unsigned char *sha) +{ + if (reset_almost_hard(sha)) + return error("Cannot fast forward to %s", sha1_to_hex(sha)); + if (verbosity > 1) + printf("Fast forward to %s\n", sha1_to_hex(sha)); + return 0; +} + static int set_verbosity(int verbose) { char tmp[] = "0"; -- 1.6.4.271.ge010d