Re: [PATCH] mergetool merge/skip/abort

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 25, 2009, 05:20 UTC
Message-ID: <7vljt0j70w.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090125064539.6117@nanako3.lavabit.com>

Nanako Shiraishi <nanako3@lavabit.com> writes:

Show 10 quoted lines

>  2. patterns in case command start at the same column as case and esac,
>     and ";;" is at the same column as any other commands.
>
> 	case "$ans" in
> 	[mM]*|"")
> 		break
> 		;;
> 	[Ss]*)
> 		...
> 	esac

I generally prefer the above style, but mergetool is not mine, and the predominant style in it is:

        case xyzzy in
            frotz)
                do this
                ;;
            nitfol)
                do that
                ;;
        esac

Namely, case arms' labels are indented by 4 spaces from case/esac, and the commands in each case arm are further indented by 4 spaces (including the terminating double-semicolon).

It is always preferable to match the _local_ convention. I'd expect a new script added to git suite to match my preference (the one I showed you in my comments to you that is used in git-am, which is what you suggested above), but I'd expect a modification to mergetool to match the style mergetool already uses.

IOW, Caleb's indentation style is fine. The placement of double-semicolon is not, though.