mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status: show commit sha1 in "You are currently cherry-picking" message

Browse Source 
Especially helpful when cherry-picking multiple commits.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Ralf Thielow
2013-10-11 17:58:37 +02:00
committed by Jonathan Nieder
parent 59c2220528
commit bffd809870
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t7512-status-help.sh
View File

@ -626,9 +626,10 @@ test_expect_success 'prepare for cherry-pick conflicts' '
test_expect_success 'status when cherry-picking before resolving conflicts' ' test_expect_success 'status when cherry-picking before resolving conflicts' '
test_when_finished "git cherry-pick --abort" && test_when_finished "git cherry-pick --abort" &&
test_must_fail git cherry-pick cherry_branch_second && test_must_fail git cherry-pick cherry_branch_second &&
cat >expected <<\EOF && TO_CHERRY_PICK=$(git rev-parse --short CHERRY_PICK_HEAD) &&
cat >expected <<EOF &&
On branch cherry_branch On branch cherry_branch
You are currently cherry-picking. You are currently cherry-picking commit $TO_CHERRY_PICK.
(fix conflicts and run "git cherry-pick --continue") (fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation) (use "git cherry-pick --abort" to cancel the cherry-pick operation)
@ -648,11 +649,12 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
git reset --hard cherry_branch && git reset --hard cherry_branch &&
test_when_finished "git cherry-pick --abort" && test_when_finished "git cherry-pick --abort" &&
test_must_fail git cherry-pick cherry_branch_second && test_must_fail git cherry-pick cherry_branch_second &&
TO_CHERRY_PICK=$(git rev-parse --short CHERRY_PICK_HEAD) &&
echo end >main.txt && echo end >main.txt &&
git add main.txt && git add main.txt &&
cat >expected <<\EOF && cat >expected <<EOF &&
On branch cherry_branch On branch cherry_branch
You are currently cherry-picking. You are currently cherry-picking commit $TO_CHERRY_PICK.
(all conflicts fixed: run "git cherry-pick --continue") (all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation) (use "git cherry-pick --abort" to cancel the cherry-pick operation)

7
wt-status.c
View File

@ -996,7 +996,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
struct wt_status_state *state, struct wt_status_state *state,
const char *color) const char *color)
{ {
status_printf_ln(s, color, _("You are currently cherry-picking.")); status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
if (s->hints) { if (s->hints) {
if (has_unmerged(s)) if (has_unmerged(s))
status_printf_ln(s, color, status_printf_ln(s, color,
@ -1169,8 +1170,10 @@ void wt_status_get_state(struct wt_status_state *state,
state->rebase_in_progress = 1; state->rebase_in_progress = 1;
state->branch = read_and_strip_branch("rebase-merge/head-name"); state->branch = read_and_strip_branch("rebase-merge/head-name");
state->onto = read_and_strip_branch("rebase-merge/onto"); state->onto = read_and_strip_branch("rebase-merge/onto");
} else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) { } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st) &&
!get_sha1("CHERRY_PICK_HEAD", sha1)) {
state->cherry_pick_in_progress = 1; state->cherry_pick_in_progress = 1;
hashcpy(state->cherry_pick_head_sha1, sha1);
} }
if (!stat(git_path("BISECT_LOG"), &st)) { if (!stat(git_path("BISECT_LOG"), &st)) {
state->bisect_in_progress = 1; state->bisect_in_progress = 1;

1
wt-status.h
View File

@ -88,6 +88,7 @@ struct wt_status_state {
char *detached_from; char *detached_from;
unsigned char detached_sha1[20]; unsigned char detached_sha1[20];
unsigned char revert_head_sha1[20]; unsigned char revert_head_sha1[20];
unsigned char cherry_pick_head_sha1[20];
}; };
void wt_status_prepare(struct wt_status *s); void wt_status_prepare(struct wt_status *s);