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

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Apr 24, 2013, 07:05 UTC
Message-ID: <CAPig+cR2rvgptVvyDNOJijUZEGN5T_=uJ6xjs_sN9E+=5+sAvQ@mail.gmail.com>
In-Reply-To: <1366720507-16504-1-git-send-email-zoltan.klinger@gmail.com>

On Tue, Apr 23, 2013 at 8:35 AM, Zoltan Klinger <zoltan.klinger@gmail.com> wrote:

Show 13 quoted lines

> 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

s/alredy/already/

Show 16 quoted lines

> 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>