Paul Tan <pyokagan@xxxxxxxxx> writes:
> @@ -82,6 +84,8 @@ struct am_state {
> /* number of digits in patch filename */
> int prec;
>
> + int threeway;
> +
> int quiet;
>
> int append_signoff;
These "one line surrounded by blank on both sides" starts to get
irritating, and the structure looksq horrifying after you apply all
these patches. Perhaps have a clean-up patch at the end to make
them look more like this?
struct am_state {
/* state directory path */
char *dir;
/* current and last patch numbers, 1-indexed */
int cur;
int last;
/* commit metadata and message */
char *author_name;
char *author_email;
char *author_date;
char *msg;
size_t msg_len;
/* when --rebasing, records the original commit the patch came from */
unsigned char orig_commit[GIT_SHA1_RAWSZ];
/* number of digits in patch filename */
int prec;
/* various operating modes and command line options */
int interactive;
int threeway;
int quiet;
int append_signoff;
int utf8;
int committer_date_is_author_date;
int ignore_date;
int allow_rerere_autoupdate;
const char *sign_commit;
int rebasing;
/* one of the enum keep_type values */
int keep;
/* pass -m flag to git-mailinfo */
int message_id;
/* one of the enum scissors_type values */
int scissors;
/* used when spawning "git apply" via run_command() */
struct argv_array git_apply_opts;
/* override error message when patch failure occurs */
const char *resolvemsg;
};
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html