diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:22:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:22:01 -0800 |
| commit | 65099bd7752362df440571881d4a2825c7cd8d5d (patch) | |
| tree | 0405a03466925911dfe96614b08202d72f87689f | |
| parent | Merge branch 'rs/xdiff-ignore-ws-w-func-context' (diff) | |
| parent | bisect--helper: convert `*_warning` char pointers to char arrays. (diff) | |
| download | git-65099bd7752362df440571881d4a2825c7cd8d5d.tar.xz git-65099bd7752362df440571881d4a2825c7cd8d5d.zip | |
Merge branch 'mr/bisect-save-pointer-to-const-string'
Code cleanup.
* mr/bisect-save-pointer-to-const-string:
bisect--helper: convert `*_warning` char pointers to char arrays.
| -rw-r--r-- | builtin/bisect--helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 3055b2bb50e..1718df7f098 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -282,11 +282,11 @@ static int mark_good(const char *refname, const struct object_id *oid, return 1; } -static const char *need_bad_and_good_revision_warning = +static const char need_bad_and_good_revision_warning[] = N_("You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that."); -static const char *need_bisect_start_warning = +static const char need_bisect_start_warning[] = N_("You need to start by \"git bisect start\".\n" "You then need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that."); |