All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 1/2] rebase -i --root: simplify code
Date: Mon, 26 Jan 2009 00:49:22 +0100	[thread overview]
Message-ID: <200901260049.25563.trast@student.ethz.ch> (raw)
In-Reply-To: <alpine.DEB.1.00.0901260031460.14855@racer>

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

Johannes Schindelin wrote:
> 
> When we rebase with --root, what we are actually picking are the commits
> in $ONTO..$HEAD.  So $ONTO is really our $UPSTREAM.  Spell it out.
[...]
> +			UPSTREAM=$ONTO

While I think the simplification is reasonable, it breaks this check:

  get_saved_options () {
  # ...
          test ! -s "$DOTEST"/upstream && REBASE_ROOT=t
  }

So you'll have to change that too.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2009-01-25 23:50 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-25 23:31 [PATCH 0/2] rebase -i --root cleanups Johannes Schindelin
2009-01-25 23:31 ` [PATCH 1/2] rebase -i --root: simplify code Johannes Schindelin
2009-01-25 23:49   ` Thomas Rast [this message]
2009-01-25 23:53     ` Thomas Rast
2009-01-26  5:54       ` Junio C Hamano
2009-01-26  9:05         ` [PATCH] rebase -i: correctly remember --root flag across --continue Thomas Rast
2009-01-26 20:47           ` Junio C Hamano
2009-01-26 21:05           ` Junio C Hamano
2009-01-26 21:09             ` Jeff King
2009-01-26 21:12               ` Jeff King
2009-01-26 21:28             ` Thomas Rast
2009-01-27  0:29               ` Junio C Hamano
2009-01-26 21:49             ` Junio C Hamano
2009-01-30 22:43               ` Thomas Rast
2009-01-30 22:47                 ` [PATCH 1/2] t3412: clean up GIT_EDITOR usage Thomas Rast
2009-01-30 22:47                   ` [PATCH 2/2] t3412: use log|name-rev instead of log --graph Thomas Rast
2009-02-01 22:24                   ` [PATCH 1/2] t3412: clean up GIT_EDITOR usage Johannes Schindelin
2009-02-02  8:39                     ` Thomas Rast
2009-01-26  0:44     ` [PATCH 1/2] rebase -i --root: simplify code Johannes Schindelin
2009-01-25 23:32 ` [PATCH 2/2] rebase -i --root: fix check for number of arguments Johannes Schindelin
2009-01-26  0:07   ` Thomas Rast
2009-01-26  0:49     ` Johannes Schindelin

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=200901260049.25563.trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=Johannes.Schindelin@gmx.de \
    --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.