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

Re: [PATCH 1/4] difftool--helper: Make style consistent with git

From
David Aguilar <davvid@gmail.com>
Date
Aug 18, 2011, 09:08 UTC
Message-ID
<20110818090810.GA15416@gmail.com>
In-Reply-To
<CAHGBnuPRsh0WDVSFr0X1Y+nb=94pJVv8=evFQCjdcd_y9ux97A@mail.gmail.com>
On Thu, Aug 18, 2011 at 09:49:33AM +0200, Sebastian Schuberth wrote:
Show 14 quoted lines
> On Thu, Aug 18, 2011 at 09:23, David Aguilar <davvid@gmail.com> wrote:
> 
> > Use the predominant conditional style where "then" appears
> > alone on the line after the test expression.
> 
> I support your effort to unify the style, but for my personal taste it
> has gone the wrong way :-) Even if "then" on its own line was the
> predominant style in the merge scripts, I would have voted for putting
> all "then" in the same line as "if" as I find this easier to read and
> comprehend. But then again it's obvious that such a change would
> polarize ;-)
> 
> -- 
> Sebastian Schuberth

I am fine reworking it either way. There's not a specific note about it in Documentation/CodingStyle.

If someone wants to make the final call I can patch the docs and rework these patches as needed.

Thanks,
-- 
					David
Previous: Sebastian SchuberthNext: Junio C Hamano
Message 4 of 18 in “Refactor git-mergetool--lib.sh”
  1. 0/4 Refactor git-mergetool--lib.shDavid Aguilar, Aug 18, 2011
  2. 1/4 difftool--helper: Make style consistent with gitDavid Aguilar, Aug 18, 2011
  3. Sebastian SchuberthAug 18, 2011
  4. David AguilarAug 18, 2011
  5. Junio C HamanoAug 18, 2011
  6. 2/4 mergetool--lib: Make style consistent with gitDavid Aguilar, Aug 18, 2011
  7. 3/4 mergetool--lib: Refactor tools into separate filesDavid Aguilar, Aug 18, 2011
  8. Makefile: fix permissions of mergetools/ checked out with permissive umaskJonathan Nieder, Oct 9, 2011
  9. Jonathan NiederOct 9, 2011
  10. David AguilarOct 9, 2011
  11. Jonathan NiederOct 9, 2011
  12. Junio C HamanoOct 11, 2011
  13. 4/4 mergetools/meld: Use '--output' when availableDavid Aguilar, Aug 18, 2011
  14. Jonathan NiederAug 18, 2011
  15. David AguilarAug 18, 2011
  16. 4/4 mergetools/meld: Use '--output' when availableDavid Aguilar, Aug 19, 2011
  17. Junio C HamanoAug 19, 2011
  18. Sebastian SchuberthAug 18, 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.