git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv6 5/6] commit: --squash option for use with rebase --autosquash

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 27, 2010, 22:35 UTC
Message-ID
<7veibbb6wg.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1287689637-95301-6-git-send-email-patnotz@gmail.com>
"Pat Notz" <patnotz@gmail.com> writes:
Show 18 quoted lines
> diff --git a/builtin/commit.c b/builtin/commit.c
> index c82108c..0608b76 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -567,6 +568,23 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
>  	if (!no_verify && run_hook(index_file, "pre-commit", NULL))
>  		return 0;
>  
> +	if (squash_message) {
> +		/*
> +		 * Insert the proper subject line before other commit
> +		 * message options add their content.
> +		 */
> +		struct pretty_print_context ctx = {0};
> +		struct commit *commit;
> +		const char *out_enc;
> +		commit = lookup_commit_reference_by_name(squash_message);
> +		out_enc = get_commit_output_encoding();
Same comment as the one for 3/6 applies here.
Previous: Pat NotzNext: Pat Notz
Message 10 of 11 in “[PATCHv6 0/6] Add commit message options for rebase --autosquash”
  1. Pat NotzOct 21, 2010
  2. 1/6 commit: helper methods to reduce redundant blocks of codePat Notz, Oct 21, 2010
  3. 2/6 pretty.c: teach format_commit_message() to reencode the outputPat Notz, Oct 21, 2010
  4. Junio C HamanoOct 27, 2010
  5. 3/6 commit: --fixup option for use with rebase --autosquashPat Notz, Oct 21, 2010
  6. Junio C HamanoOct 27, 2010
  7. 4/6 add tests of commit --fixupPat Notz, Oct 21, 2010
  8. Junio C HamanoOct 27, 2010
  9. 5/6 commit: --squash option for use with rebase --autosquashPat Notz, Oct 21, 2010
  10. Junio C HamanoOct 27, 2010
  11. 6/6 add tests of commit --squashPat Notz, Oct 21, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.