status: show commit sha1 in "You are currently reverting" message
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Apr 2, 2013 at 16:20 UTC
87e139c0ad32b72ad989fe7d69381f1146250f7a
3 files changed
+11
-5
t/t7512-status-help.sh
+4
-3
@@ -686,10 +686,11 @@ test_expect_success 'status while reverting commit (conflicts)' '
686
test_commit old to-revert.txt &&
687
echo new >to-revert.txt &&
688
test_commit new to-revert.txt &&
689
- test_must_fail git revert HEAD^ &&
689
+ TO_REVERT=$(git rev-parse --short HEAD^) &&
690
+ test_must_fail git revert $TO_REVERT &&
691
cat >expected <<-EOF
692
# On branch master
692
- # You are currently reverting a commit.
693
+ # You are currently reverting commit $TO_REVERT.
694
# (fix conflicts and run "git revert --continue")
695
# (use "git revert --abort" to cancel the revert operation)
696
#
@@ -710,7 +711,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' '
711
git add to-revert.txt &&
712
cat >expected <<-EOF
713
# On branch master
713
- # You are currently reverting a commit.
714
+ # You are currently reverting commit $TO_REVERT.
715
# (all conflicts fixed: run "git revert --continue")
716
# (use "git revert --abort" to cancel the revert operation)
717
#
wt-status.c
+6
-2
@@ -969,7 +969,8 @@ static void show_revert_in_progress(struct wt_status *s,
969
struct wt_status_state *state,
970
const char *color)
971
{
972
- status_printf_ln(s, color, _("You are currently reverting a commit."));
972
+ status_printf_ln(s, color, _("You are currently reverting commit %s."),
973
+ find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
974
if (advice_status_hints) {
975
if (has_unmerged(s))
976
status_printf_ln(s, color,
@@ -1104,6 +1105,7 @@ void wt_status_get_state(struct wt_status_state *state,
1105
int get_detached_from)
1106
{
1107
struct stat st;
1108
+ unsigned char sha1[20];
1109
1110
if (!stat(git_path("MERGE_HEAD"), &st)) {
1111
state->merge_in_progress = 1;
@@ -1131,8 +1133,10 @@ void wt_status_get_state(struct wt_status_state *state,
1133
state->bisect_in_progress = 1;
1134
state->branch = read_and_strip_branch("BISECT_START");
1135
}
1134
- if (!stat(git_path("REVERT_HEAD"), &st)) {
1136
+ if (!stat(git_path("REVERT_HEAD"), &st) &&
1137
+ !get_sha1("REVERT_HEAD", sha1)) {
1138
state->revert_in_progress = 1;
1139
+ hashcpy(state->revert_head_sha1, sha1);
1140
}
1141
1142
if (get_detached_from)
wt-status.h
+1
@@ -85,6 +85,7 @@ struct wt_status_state {
85
char *onto;
86
char *detached_from;
87
unsigned char detached_sha1[20];
88
+ unsigned char revert_head_sha1[20];
89
};
90
91
void wt_status_prepare(struct wt_status *s);