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

Re: [PATCH v3] Add log.abbrevCommit config variable

From
Junio C Hamano <gitster@pobox.com>
Date
May 17, 2011, 18:50 UTC
Message-ID
<7vy625f9fc.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1305413341-56450-1-git-send-email-jaysoffian@gmail.com>
Jay Soffian <jaysoffian@gmail.com> writes:
Show 10 quoted lines
> @@ -137,6 +139,12 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>  	    && rev->commit_format == CMIT_FMT_RAW)
>  		decoration_style = 0;
>  
> +	/* ditto for log.abbrevCommit */
> +	if (!rev->abbrev_commit_given && rev->abbrev_commit
> +	    && rev->commit_format == CMIT_FMT_RAW)
> +		rev->abbrev_commit = 0;
> +
> +
This is not exactly "ditto"; the lines before this hunk look like this:
	/*
	 * defeat log.decorate configuration interacting with --pretty=raw
	 * from the command line.
	 */
	if (!decoration_given && rev->pretty_given
	    && rev->commit_format == CMIT_FMT_RAW)
		decoration_style = 0;

The check for pretty-given and commit-format being raw is to catch only the case where the command line said --pretty=raw, excluding any case the commit-format is set to raw without any explicit --pretty=raw on the command line. So at the logical level, this one should be read as if it was written like this:

	if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
        	/* "log --pretty=raw" is special */
        	if (!decoration_given)
			decoration_style = 0;
	}

even though the existing one makes it look as if checking decoration-given and pretty-given together when commit-format is set to raw.

Care to explain why your check has to be different? If there is no reason to use a different logic, then a natural thing to do is to rewrite the existing decoration logic and add yours like this:

	if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
        	/* "log --pretty=raw" is special */
        	if (!decoration_given)
			decoration_style = 0;
		if (!abbrev_commit_given)
			rev->abbrev_commit = 0;
	}
Previous: Jay SoffianNext: Jay Soffian
Message 19 of 22 in “Add log.abbrev-commit config option”
  1. Add log.abbrev-commit config optionJay Soffian, May 14, 2011
  2. Jay SoffianMay 14, 2011
  3. Jonathan NiederMay 14, 2011
  4. Jay SoffianMay 14, 2011
  5. add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder, May 14, 2011
  6. Junio C HamanoMay 15, 2011
  7. Add log.abbrevCommit config variableJay Soffian, May 14, 2011
  8. Jonathan NiederMay 14, 2011
  9. Jay SoffianMay 14, 2011
  10. Add log.abbrevCommit config variableJay Soffian, May 14, 2011
  11. Jay SoffianMay 15, 2011
  12. Junio C HamanoMay 15, 2011
  13. Jay SoffianMay 16, 2011
  14. Jonathan NiederMay 16, 2011
  15. Jay SoffianMay 16, 2011
  16. Junio C HamanoMay 17, 2011
  17. Junio C HamanoMay 17, 2011
  18. Jay SoffianMay 18, 2011
  19. Junio C HamanoMay 17, 2011
  20. Jay SoffianMay 17, 2011
  21. Junio C HamanoMay 15, 2011
  22. Michael J GruberMay 16, 2011

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.