Merge branch 'jn/rpm-spec'

[git.git] / builtin / commit.c

diff --git a/builtin/commit.c b/builtin/commit.c
index eba1377eb32c02e57c46364c381df940afa66048..470b4a4e8c704b995124ebd08bcab225a62601e8 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -196,16 +196,16 @@ static void determine_whence(struct wt_status *s)
 
 static const char *whence_s(void)
 {
-       char *s = "";
+       const char *s = "";
 
        switch (whence) {
        case FROM_COMMIT:
                break;
        case FROM_MERGE:
-               s = "merge";
+               s = _("merge");
                break;
        case FROM_CHERRY_PICK:
-               s = "cherry-pick";
+               s = _("cherry-pick");
                break;
        }