[PATCH v2] status: show the branch name if possible in in-progress info

2013-01-29 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- - fix bisecting on detached HEAD - show onto sha-1 for rebase t/t7512-status-help.sh | 36 ++-- wt-status.c| 91 ++ wt-status.h| 2 ++ 3 files

Re: [PATCH v2] status: show the branch name if possible in in-progress info

2013-01-29 Thread Jonathan Nieder
Hi Duy, Nguyễn Thái Ngọc Duy wrote: --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -76,7 +76,7 @@ test_expect_success 'status when rebase in progress before resolving conflicts' test_must_fail git rebase HEAD^ --onto HEAD^^ cat expected -\EOF # Not

Re: [PATCH v2] status: show the branch name if possible in in-progress info

2013-01-29 Thread Duy Nguyen
On Wed, Jan 30, 2013 at 1:44 AM, Jonathan Nieder jrnie...@gmail.com wrote: - # You are currently rebasing. + # You are currently rebasing branch '\''rebase_conflicts'\'' on '\''000106f'\''. SHA1-in-tests radar blinking. Would it be possible to compute the expected output, as in