Re: [PATCH v3 2/6] commit: add amend suboption to --fixup to create amend! commit

2 messages, 2 authors, 2021-03-04 · open the first message on its own page

Re: [PATCH v3 2/6] commit: add amend suboption to --fixup to create amend! commit

From: Junio C Hamano <hidden>
Date: 2021-03-01 18:37:28

Charvi Mendiratta [off-list ref] writes:
+static int prepare_amend_commit(struct commit *commit, struct strbuf *sb,
+								 struct pretty_print_context *ctx) {
Why does this need to be overly indented?  Are you using some funny
tab width settings?  In this project, a tab stop is 8-spaces wide.
quoted hunk
+		/*
+		 * Only `-m` commit message option is checked here, as
+		 * it supports `--fixup` to append the commit message.
As it is OK to use "-m" with the plain vanilla "--fixup", an earlier
check did not reject the combination, but now we look at what kind
of fixup it is, and error out if it is "--fixup=amend:".  OK.
quoted hunk
+		 * The other commit message options `-c`/`-C`/`-F` are
+		 * incompatible with all the forms of `--fixup` and
+		 * have already errored out while parsing the `git commit`
+		 * options.
+		 */

Re: [PATCH v3 2/6] commit: add amend suboption to --fixup to create amend! commit

From: Charvi Mendiratta <hidden>
Date: 2021-03-04 00:22:40

On Tue, 2 Mar 2021 at 00:04, Junio C Hamano [off-list ref] wrote:
Charvi Mendiratta [off-list ref] writes:
quoted
+static int prepare_amend_commit(struct commit *commit, struct strbuf *sb,
+                                                              struct pretty_print_context *ctx) {
Why does this need to be overly indented?  Are you using some funny
tab width settings?  In this project, a tab stop is 8-spaces wide.
Oops, I myself didn't expect it after cross-check in the vscode
editor. I will fix this.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help