Thread (34 messages) 34 messages, 4 authors, 2018-05-29

Re: [PATCH 6/9] am: move advice.amWorkDir parsing back to advice.c

From: Eric Sunshine <hidden>
Date: 2018-05-11 22:43:00

On Thu, May 10, 2018 at 10:19 AM Nguyễn Thái Ngọc Duy [off-list ref]
wrote:
The only benefit from this move (apart from cleaner code) is that
advice.amWorkDir should now show up in `git help --config`. There
should be no regression since advice config is always read by the
git_default_config().
While at there, use advise() like other code. We now get "hint: "
prefix and the output is stderr instead of stdout (which is also the
reason for the test update because stderr is checked in a following
test and the extra advice can fail it).
quoted hunk ↗ jump to hunk
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
diff --git a/builtin/am.c b/builtin/am.c
@@ -1827,15 +1827,12 @@ static void am_run(struct am_state *state, int
resume)
                 if (apply_status) {
-                       int advice_amworkdir = 1;

Nit: Maybe also delete the blank line following the removed declaration...
                         printf_ln(_("Patch failed at %s %.*s"),
msgnum(state),
                                 linelen(state->msg), state->msg);
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help