git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Stephan Beyer <s-beyer@gmx.net>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH v4 07/15] sequencer: add "do_fast_forward()" to perform a fast forward
Date: Fri, 28 Aug 2009 06:47:37 +0200	[thread overview]
Message-ID: <20090828044746.4307.88217.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20090828043913.4307.34708.chriscool@tuxfamily.org>

From: Stephan Beyer <s-beyer@gmx.net>

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 <barkalow@iabervon.org>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 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

  parent reply	other threads:[~2009-08-28  5:00 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-28  4:47 [PATCH v4 00/15] complete reroll of my "port rebase -i to C" series Christian Couder
2009-08-28  4:47 ` [PATCH v4 01/15] sequencer: add "builtin-sequencer--helper.c" Christian Couder
2009-08-28  4:47 ` [PATCH v4 02/15] sequencer: add "make_patch" function to save a patch Christian Couder
2009-08-28  4:47 ` [PATCH v4 03/15] rebase -i: use "git sequencer--helper --make-patch" Christian Couder
2009-08-28  4:47 ` [PATCH v4 04/15] sequencer: add "reset_almost_hard()" and related functions Christian Couder
2009-08-28  6:08   ` Eric Raible
2009-08-28  4:47 ` [PATCH v4 05/15] sequencer: add "--reset-hard" option to "git sequencer--helper" Christian Couder
2009-08-28  4:47 ` [PATCH v4 06/15] rebase -i: use "git sequencer--helper --reset-hard" Christian Couder
2009-08-28  4:47 ` Christian Couder [this message]
2009-08-28  4:47 ` [PATCH v4 08/15] sequencer: add "--fast-forward" option to "git sequencer--helper" Christian Couder
2009-08-28  4:47 ` [PATCH v4 09/15] sequencer: let "git sequencer--helper" callers set "allow_dirty" Christian Couder
2009-08-28  4:47 ` [PATCH v4 10/15] rebase -i: use "git sequencer--helper --fast-forward" Christian Couder
2009-08-28  4:47 ` [PATCH v4 11/15] revert: libify cherry-pick and revert functionnality Christian Couder
2009-08-28  4:47 ` [PATCH v4 12/15] pick: libify "pick_help_msg()" Christian Couder
2009-08-28  4:47 ` [PATCH v4 13/15] sequencer: add "do_commit()" and related functions working on "next_commit" Christian Couder
2009-08-28  4:47 ` [PATCH v4 14/15] sequencer: add "--cherry-pick" option to "git sequencer--helper" Christian Couder
2009-08-28  4:47 ` [PATCH v4 15/15] rebase -i: use "git sequencer--helper --cherry-pick" Christian Couder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090828044746.4307.88217.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    --cc=s-beyer@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).