All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v9] ls-files: Add eol diagnostics
Date: Mon, 04 Jan 2016 13:16:08 -0800	[thread overview]
Message-ID: <xmqq37udnizr.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <56845C0A.1060404@web.de> ("Torsten =?utf-8?Q?B=C3=B6gershaus?= =?utf-8?Q?en=22's?= message of "Wed, 30 Dec 2015 23:34:50 +0100")

This one is severely whitespace damaged.

It is _possible_ for me to fix these up manually, but because there
is no guarantee that I caught them all (i.e. the end result may
contain some leading whitespaces you did not intend them to be
there, if the whitespace corruption did not break the syntax of the
diff), I'd rather not to do that.

> +	Show line endings (<eolinfo>) and the text/eol attributes (<texteolattr>) of
> files.
> +	<eolinfo> is the file content identification used by Git when

wrapped

>  diff --git a/builtin/ls-files.c b/builtin/ls-files.c
> index b6a7cb0..73b2ba6 100644

indented funnily

>  @@ -170,6 +187,7 @@ static void show_ce_entry(const char *tag, const struct
> cache_entry *ce)

wrapped

>  		       find_unique_abbrev(ce->sha1,abbrev),
>  		       ce_stage(ce));
>  	}
> +	write_eolinfo(ce, ce->name);
>  	write_name(ce->name);
>  	if (debug_mode) {
>  		const struct stat_data *sd = &ce->ce_stat_data;
> @@ -433,6 +451,7 @@ int cmd_ls_files(int argc, const char **argv, const char
> *cmd_prefix)

wrapped

> +		git ls-files --eol $src* | sed -e 's!attr/[=a-z-]*!!g' -e 's/  */ /g' | sort
>>actual &&

wrapped.  For shell scripts, change the line immediately after '|',
reglardless of the length of the line; that would automatically
avoid unnecessarily overlong lines.

>  checkout_files    native  true  "crlf"    CRLF  CRLF  CRLF         CRLF_mix_CR
>  CRLF_nul
>  +# Should be the last test case: remove some files from the worktree
> +# This test assumes that "rm" can remove staged files

indented funnily.

  reply	other threads:[~2016-01-04 21:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-30 22:34 [PATCH v9] ls-files: Add eol diagnostics Torsten Bögershausen
2016-01-04 21:16 ` Junio C Hamano [this message]
2016-01-05 12:26 Torsten Bögershausen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq37udnizr.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=tboegi@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.