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

Re: [PATCH] rebase -i: give rerere a chance

From
David Kastrup <dak@gnu.org>
Date
Nov 29, 2007, 09:59 UTC
Message-ID
<85y7ch5q4v.fsf@lola.goethe.zz>
In-Reply-To
<Pine.LNX.4.64.0711290021280.27959@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 25 quoted lines
> Hi,
>
> On Wed, 28 Nov 2007, Junio C Hamano wrote:
>
>> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> 
>> > @@ -166,13 +167,13 @@ pick_one_preserving_merges () {
>> >  			msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
>> >  			# No point in merging the first parent, that's HEAD
>> >  			new_parents=${new_parents# $first_parent}
>> > -			# NEEDSWORK: give rerere a chance
>> >  			if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
>> >  				GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
>> >  				GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
>> >  				output git merge $STRATEGY -m "$msg" \
>> >  					$new_parents
>> >  			then
>> > +				git rerere
>> 
>> This comment is not about this rerere change, but output is a shell
>> function and I vaguely recall we had a discussion on "VAR=VAL cmd" form
>> of single-shot export not working for them as expected...
>
> Hmm.  What do you propose?  In the long run, I _want_ to have rebase as a 
> builtin, which would solve this problem, probably.  But in the short run?
Well, something like
if ! ( GIT_xxx=A; export GIT_xxx; output git merge ... )
should likely work.
-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum
Previous: Johannes SchindelinNext: David Brown
Message 10 of 14 in “Reordering lines in "git-rebase -i" task sheet”
  1. Junio C HamanoNov 22, 2007
  2. rebase -i: move help to end of todo fileJohannes Schindelin, Nov 22, 2007
  3. Adjust t3404 to ignore empty lines in the todo fileJohannes Schindelin, Nov 22, 2007
  4. Junio C HamanoNov 22, 2007
  5. Johannes SchindelinNov 22, 2007
  6. Jeff KingNov 22, 2007
  7. rebase -i: give rerere a chanceJohannes Schindelin, Nov 22, 2007
  8. Junio C HamanoNov 29, 2007
  9. Johannes SchindelinNov 29, 2007
  10. David KastrupNov 29, 2007
  11. David BrownNov 22, 2007
  12. Johannes SchindelinNov 22, 2007
  13. Andy ParkinsNov 23, 2007
  14. Andy ParkinsNov 26, 2007

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.