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

Re: [PATCH] git-prompt.sh: Show where rebase is at when interrupted by a merge conflict

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 24, 2013, 07:14 UTC
Message-ID
<CAMP44s2uOkNEfAE3mcDn2CTo4c-HqzoJ_bSJNfdiGRT60sDV0w@mail.gmail.com>
In-Reply-To
<7vk3ntl1x9.fsf@alter.siamese.dyndns.org>
On Tue, Apr 23, 2013 at 10:08 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 34 quoted lines
> Zoltan Klinger <zoltan.klinger@gmail.com> writes:
>
>> When a rebase is interrupted by a merge conflict it could be useful to
>> know how far a rebase has progressed and how many commits in total this
>> rebase will apply. Teach the __git_ps1() command to display the number
>> of commits so far applied and the total number of commits to be applied.
>>
>> Below is a sample output of the improved __git_ps1() command:
>>   ((3ec0a6a...)|REBASE|2/5)
>>
>> In the example above the rebase has stopped at the second commit due to
>> a merge conflict and there are a total number of five commits to be
>> applied by this rebase.
>>
>> This information can be alredy obtained from the following files which are
>> being generated during the rebase:
>>     GIT_DIR/.git/rebase-merge/msgnum (git-rebase--merge.sh)
>>     GIT_DIR/.git/rebase-merge/end    (git-rebase--merge.sh)
>>     GIT_DIR/.git/rebase-apply/next   (git-am.sh)
>>     GIT_DIR/.git/rebase-apply/last   (git-am.sh)
>>
>> 1) Modify git-rebase--interactive.sh to also create
>>       GIT_DIR/.git/rebase-merge/msgnum
>>       GIT_DIR/.git/rebase-merge/end
>>    files for the number of commits so far applied and the total number of
>>    commits to be applied.
>> 2) Modify git-prompt.sh to read and display info from the above files
>> 3) Update test t9903-bash-prompt.sh to reflect changes introduced by
>>    this patch.
>>
>> Signed-off-by: Zoltan Klinger <zoltan.klinger@gmail.com>
>> ---
>
> Nicely explained.  Felipe?  Szeder?  Comments?
Looks good to me.
-- 
Felipe Contreras
Previous: Junio C HamanoNext: Eric Sunshine
Message 3 of 4 in “git-prompt.sh: Show where rebase is at when interrupted by a merge conflict”
  1. git-prompt.sh: Show where rebase is at when interrupted by a merge conflictZoltan Klinger, Apr 23, 2013
  2. Junio C HamanoApr 23, 2013
  3. Felipe ContrerasApr 24, 2013
  4. Eric SunshineApr 24, 2013

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.