From: Paul Tan <pyokagan@gmail.com>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: "Git List" <git@vger.kernel.org>,
"Christian Couder" <christian.couder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH 1/5] am: Fix filename in safe_to_abort() error message
Date: Thu, 8 Dec 2016 18:21:23 +0800 [thread overview]
Message-ID: <CACRoPnSzHo2wqZyP6nfMaZBCy9-m6E72vTGRTjGcuSdo-qJ4dw@mail.gmail.com> (raw)
In-Reply-To: <20161207215133.13433-1-s-beyer@gmx.net>
Hi Stephan,
On Thu, Dec 8, 2016 at 5:51 AM, Stephan Beyer <s-beyer@gmx.net> wrote:
> diff --git a/builtin/am.c b/builtin/am.c
> index 6981f42ce..7cf40e6f2 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -2124,7 +2124,7 @@ static int safe_to_abort(const struct am_state *state)
>
> if (read_state_file(&sb, state, "abort-safety", 1) > 0) {
> if (get_oid_hex(sb.buf, &abort_safety))
> - die(_("could not parse %s"), am_path(state, "abort_safety"));
> + die(_("could not parse %s"), am_path(state, "abort-safety"));
Ah, this is obviously correct. Sorry for the oversight.
> } else
> oidclr(&abort_safety);
>
> --
> 2.11.0.27.g4eed97c
Thanks,
Paul
next prev parent reply other threads:[~2016-12-08 10:21 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-06 18:58 BUG: "cherry-pick A..B || git reset --hard OTHER" Junio C Hamano
2016-12-07 14:31 ` Christian Couder
2016-12-07 18:36 ` Stephan Beyer
2016-12-07 20:04 ` Junio C Hamano
2016-12-07 20:35 ` Stephan Beyer
2016-12-07 23:21 ` Duy Nguyen
2016-12-09 11:33 ` Duy Nguyen
2016-12-09 11:34 ` [PATCH] rebase: rename --forget to be consistent with sequencer Nguyễn Thái Ngọc Duy
2016-12-09 11:34 ` [PATCH] revert, cherry-pick: rename --quit to be consistent with rebase Nguyễn Thái Ngọc Duy
2016-12-09 18:07 ` BUG: "cherry-pick A..B || git reset --hard OTHER" Junio C Hamano
2016-12-09 19:24 ` Stephan Beyer
2016-12-09 19:28 ` Stephan Beyer
2016-12-10 11:00 ` Duy Nguyen
2016-12-10 21:23 ` Junio C Hamano
2016-12-08 7:50 ` Christian Couder
2016-12-07 21:51 ` [PATCH 1/5] am: Fix filename in safe_to_abort() error message Stephan Beyer
2016-12-08 10:21 ` Paul Tan [this message]
2016-12-07 21:51 ` [PATCH 2/5] am: Change safe_to_abort()'s not rewinding error into a warning Stephan Beyer
2016-12-07 21:51 ` [PATCH 3/5] Add test that cherry-pick --abort does not unsafely change HEAD Stephan Beyer
2016-12-07 21:51 ` [PATCH 4/5] Make sequencer abort safer Stephan Beyer
2016-12-08 15:28 ` Johannes Schindelin
2016-12-08 17:27 ` Junio C Hamano
2016-12-08 19:17 ` Stephan Beyer
2016-12-09 18:33 ` Junio C Hamano
2016-12-09 19:01 ` [PATCH v2 1/5] am: Fix filename in safe_to_abort() error message Stephan Beyer
2016-12-09 19:01 ` [PATCH v2 2/5] am: Change safe_to_abort()'s not rewinding error into a warning Stephan Beyer
2016-12-09 19:01 ` [PATCH v2 3/5] Add test that cherry-pick --abort does not unsafely change HEAD Stephan Beyer
2016-12-09 19:01 ` [PATCH v2 4/5] Make sequencer abort safer Stephan Beyer
2016-12-10 19:56 ` Christian Couder
2016-12-10 20:04 ` Jeff King
2016-12-10 20:20 ` Stephan Beyer
2016-12-09 19:01 ` [PATCH v2 5/5] sequencer: Remove useless get_dir() function Stephan Beyer
2016-12-07 21:51 ` [PATCH " Stephan Beyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACRoPnSzHo2wqZyP6nfMaZBCy9-m6E72vTGRTjGcuSdo-qJ4dw@mail.gmail.com \
--to=pyokagan@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=s-beyer@gmx.net \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).