From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH] branch: show (rebasing) or (bisecting) instead of (no branch) when possible
Date: Tue, 29 Jan 2013 19:12:54 +0700 [thread overview]
Message-ID: <1359461574-24529-1-git-send-email-pclouds@gmail.com> (raw)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
In the spirit of status' in-progress info. I think showing this is
more useful than "(no branch)". I tend to do "git br" more often than
"git st" and this catches my eyes.
builtin/branch.c | 10 +++++++++-
t/t6030-bisect-porcelain.sh | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 873f624..b0c5a20 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -557,7 +557,15 @@ static void show_detached(struct ref_list *ref_list)
if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
struct ref_item item;
- item.name = xstrdup(_("(no branch)"));
+ struct stat st;
+ if ((!stat(git_path("rebase-apply"), &st) &&
+ stat(git_path("rebase-apply/applying"), &st)) ||
+ !stat(git_path("rebase-merge"), &st))
+ item.name = xstrdup(_("(rebasing)"));
+ else if (!stat(git_path("BISECT_LOG"), &st))
+ item.name = xstrdup(_("(bisecting)"));
+ else
+ item.name = xstrdup(_("(no branch)"));
item.width = utf8_strwidth(item.name);
item.kind = REF_LOCAL_BRANCH;
item.dest = NULL;
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 3e0e15f..bc21bc9 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
cp .git/BISECT_START saved &&
test_must_fail git bisect start $HASH4 foo -- &&
git branch > branch.output &&
- test_i18ngrep "* (no branch)" branch.output > /dev/null &&
+ test_i18ngrep "* (bisecting)" branch.output > /dev/null &&
test_cmp saved .git/BISECT_START
'
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
--
1.8.1.1.459.g5970e58
next reply other threads:[~2013-01-29 12:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-29 12:12 Nguyễn Thái Ngọc Duy [this message]
2013-01-29 19:13 ` [PATCH] branch: show (rebasing) or (bisecting) instead of (no branch) when possible Jonathan Nieder
2013-02-03 5:48 ` [PATCH v2] branch: show rebase/bisect info when possible instead of "(no branch)" Nguyễn Thái Ngọc Duy
2013-02-03 21:23 ` Matthieu Moy
2013-02-03 21:58 ` Junio C Hamano
2013-02-03 22:00 ` Junio C Hamano
2013-02-04 13:13 ` Matthieu Moy
2013-02-04 16:18 ` Junio C Hamano
2013-02-04 7:14 ` Duy Nguyen
2013-02-04 7:17 ` Duy Nguyen
2013-02-08 10:09 ` [PATCH v3] " Nguyễn Thái Ngọc Duy
2013-02-08 18:35 ` Junio C Hamano
2013-02-14 9:46 ` Duy Nguyen
2013-02-11 19:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359461574-24529-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).