All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Brian Gernhardt <benji@silverinsanity.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Make rebase save ORIG_HEAD if using current branch
Date: Tue, 06 May 2008 08:32:02 +0200	[thread overview]
Message-ID: <481FFB62.9090804@viscovery.net> (raw)
In-Reply-To: <20080506051920.GA9165@Hermes.local>

Brian Gernhardt schrieb:
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 9b13b83..8d54d9f 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -342,6 +342,7 @@ case "$#" in
>  		branch_name=HEAD ;# detached
>  	fi
>  	branch=$(git rev-parse --verify "${branch_name}^0") || exit
> +	echo "$branch" > "$GIT_DIR/ORIG_HEAD"

1. You should be using 'git update-ref' here, I think.
2. You should detect errors.
3. Should ORIG_HEAD better be set at the end of the rebase, not at the
beginning? Because if the rebase stops for some reason, and then you do a
'git reset', you'll have overwritten the ORIG_HEAD that you have set here.

-- Hannes

  reply	other threads:[~2008-05-06  6:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-06  5:19 [PATCH] Make rebase save ORIG_HEAD if using current branch Brian Gernhardt
2008-05-06  6:32 ` Johannes Sixt [this message]
2008-05-06 17:45   ` Brian Gernhardt
2008-05-07  8:14     ` Johannes Sixt
2008-05-07 14:30       ` Junio C Hamano

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=481FFB62.9090804@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=benji@silverinsanity.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.