git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] rebase -i --root: fix check for number of arguments

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 26, 2009, 00:49 UTC
Message-ID
<alpine.DEB.1.00.0901260148290.14855@racer>
In-Reply-To
<200901260108.07402.trast@student.ethz.ch>
Hi,
On Mon, 26 Jan 2009, Thomas Rast wrote:
Show 26 quoted lines
> Johannes Schindelin wrote:
> > 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >  git-rebase--interactive.sh |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 6e2bf25..5df35b2 100755
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -571,7 +571,8 @@ first and then run 'git rebase --continue' again."
> >  		;;
> >  	--)
> >  		shift
> > -		test ! -z "$REBASE_ROOT" -o $# -eq 1 -o $# -eq 2 || usage
> > +		test -z "$REBASE_ROOT" -a $# -ge 1 -a $# -le 2 ||
> > +		test ! -z "$REBASE_ROOT" -a $# -le 1 || usage
> >  		test -d "$DOTEST" &&
> >  			die "Interactive rebase already started"
> 
> Acked-by: Thomas Rast <trast@student.ethz.ch>
> 
> I'll postpone 1/2 till I've had enough sleep to check whether
> --continue ever needed to know about --root, and either remove or fix
> the remembering.  (Sorry for the noise.)

It does need to remember, as pick_one wants to look at the parent to be able to fast-forward.

But the sane fix is to add a file "$DOTEST"/root in case we're running under --root.

Ciao, Dscho

Previous: Thomas Rast
Message 22 of 22 in “rebase -i --root cleanups”
  1. 0/2 rebase -i --root cleanupsJohannes Schindelin, Jan 25, 2009
  2. 1/2 rebase -i --root: simplify codeJohannes Schindelin, Jan 25, 2009
  3. Thomas RastJan 25, 2009
  4. Thomas RastJan 25, 2009
  5. Junio C HamanoJan 26, 2009
  6. rebase -i: correctly remember --root flag across --continueThomas Rast, Jan 26, 2009
  7. Junio C HamanoJan 26, 2009
  8. Junio C HamanoJan 26, 2009
  9. Jeff KingJan 26, 2009
  10. Jeff KingJan 26, 2009
  11. Thomas RastJan 26, 2009
  12. Junio C HamanoJan 27, 2009
  13. Junio C HamanoJan 26, 2009
  14. Thomas RastJan 30, 2009
  15. 1/2 t3412: clean up GIT_EDITOR usageThomas Rast, Jan 30, 2009
  16. 2/2 t3412: use log|name-rev instead of log --graphThomas Rast, Jan 30, 2009
  17. Johannes SchindelinFeb 1, 2009
  18. Thomas RastFeb 2, 2009
  19. Johannes SchindelinJan 26, 2009
  20. 2/2 rebase -i --root: fix check for number of argumentsJohannes Schindelin, Jan 25, 2009
  21. Thomas RastJan 26, 2009
  22. Johannes SchindelinJan 26, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.