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>

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index d745cf4e5f8a6f24b60fd9c26bd1453310f881e3..bf08d4e098f1bdc3adc5ec3df37b90d90b0e5c8f 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -686,10 +686,11 @@ test_expect_success 'status while reverting commit (conflicts)' '
        test_commit old to-revert.txt &&
        echo new >to-revert.txt &&
        test_commit new to-revert.txt &&
        test_commit old to-revert.txt &&
        echo new >to-revert.txt &&
        test_commit new to-revert.txt &&

-       test_must_fail git revert HEAD^ &&
+       TO_REVERT=$(git rev-parse --short HEAD^) &&
+       test_must_fail git revert $TO_REVERT &&

        cat >expected <<-EOF
        # On branch master
        cat >expected <<-EOF
        # On branch master

-       # You are currently reverting a commit.
+       # You are currently reverting commit $TO_REVERT.

        #   (fix conflicts and run "git revert --continue")
        #   (use "git revert --abort" to cancel the revert operation)
        #
        #   (fix conflicts and run "git revert --continue")
        #   (use "git revert --abort" to cancel the revert operation)
        #


@@ -710,7 +711,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' '
        git add to-revert.txt &&
        cat >expected <<-EOF
        # On branch master
        git add to-revert.txt &&
        cat >expected <<-EOF
        # On branch master

-       # You are currently reverting a commit.
+       # You are currently reverting commit $TO_REVERT.

        #   (all conflicts fixed: run "git revert --continue")
        #   (use "git revert --abort" to cancel the revert operation)
        #
        #   (all conflicts fixed: run "git revert --continue")
        #   (use "git revert --abort" to cancel the revert operation)
        #

diff --git a/wt-status.c b/wt-status.c
index 39f888bcc8b6cb4a32442972a7649b2825dd4d3f..09416db348cb0e5e1bfc1fe82878c9afe627e09f 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -969,7 +969,8 @@ static void show_revert_in_progress(struct wt_status *s,
                                        struct wt_status_state *state,
                                        const char *color)
 {
                                        struct wt_status_state *state,
                                        const char *color)
 {

-       status_printf_ln(s, color, _("You are currently reverting a commit."));
+       status_printf_ln(s, color, _("You are currently reverting commit %s."),
+                        find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));

        if (advice_status_hints) {
                if (has_unmerged(s))
                        status_printf_ln(s, color,
        if (advice_status_hints) {
                if (has_unmerged(s))
                        status_printf_ln(s, color,


@@ -1104,6 +1105,7 @@ void wt_status_get_state(struct wt_status_state *state,
                         int get_detached_from)
 {
        struct stat st;
                         int get_detached_from)
 {
        struct stat st;

+       unsigned char sha1[20];

 
        if (!stat(git_path("MERGE_HEAD"), &st)) {
                state->merge_in_progress = 1;
 
        if (!stat(git_path("MERGE_HEAD"), &st)) {
                state->merge_in_progress = 1;


@@ -1131,8 +1133,10 @@ void wt_status_get_state(struct wt_status_state *state,
                state->bisect_in_progress = 1;
                state->branch = read_and_strip_branch("BISECT_START");
        }
                state->bisect_in_progress = 1;
                state->branch = read_and_strip_branch("BISECT_START");
        }

-       if (!stat(git_path("REVERT_HEAD"), &st)) {
+       if (!stat(git_path("REVERT_HEAD"), &st) &&
+           !get_sha1("REVERT_HEAD", sha1)) {

                state->revert_in_progress = 1;
                state->revert_in_progress = 1;

+               hashcpy(state->revert_head_sha1, sha1);

        }
 
        if (get_detached_from)
        }
 
        if (get_detached_from)

diff --git a/wt-status.h b/wt-status.h
index 35cd6cb669d48a7029c74c325167b92721b3a0ac..4121bc208db2fbe5e4eb00af10056a9d8c0bab40 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -85,6 +85,7 @@ struct wt_status_state {
        char *onto;
        char *detached_from;
        unsigned char detached_sha1[20];
        char *onto;
        char *detached_from;
        unsigned char detached_sha1[20];

+       unsigned char revert_head_sha1[20];

 };
 
 void wt_status_prepare(struct wt_status *s);
 };
 
 void wt_status_prepare(struct wt_status *s);