Re: [PATCH v1 1/3] dir.c: coding style fix
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 14, 2014, 22:30 UTC
- Message-ID
- <xmqq4myjy3ms.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <53C3A71F.1020101@gmail.com>
Karsten Blees <karsten.blees@gmail.com> writes:
Show 6 quoted lines
> From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= > <pclouds@gmail.com> > > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> > Signed-off-by: Karsten Blees <blees@dcon.de> > ---
Thanks for forwarding. I'll fix-up the Yikes (see how these two lines show the same name in a very different way), but how did you produce the above? Is there some fix we need in the toolchain that produces patch e-mails?
Show 41 quoted lines
> dir.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dir.c b/dir.c
> index e65888d..3068ca8 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -557,8 +557,7 @@ int add_excludes_from_file_to_list(const char *fname,
> buf = xrealloc(buf, size+1);
> buf[size++] = '\n';
> }
> - }
> - else {
> + } else {
> size = xsize_t(st.st_size);
> if (size == 0) {
> close(fd);
> @@ -793,9 +792,11 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
>
> group = &dir->exclude_list_group[EXC_DIRS];
>
> - /* Pop the exclude lists from the EXCL_DIRS exclude_list_group
> + /*
> + * Pop the exclude lists from the EXCL_DIRS exclude_list_group
> * which originate from directories not in the prefix of the
> - * path being checked. */
> + * path being checked.
> + */
> while ((stk = dir->exclude_stack) != NULL) {
> if (stk->baselen <= baselen &&
> !strncmp(dir->basebuf, base, stk->baselen))
> @@ -822,8 +823,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
> if (current < 0) {
> cp = base;
> current = 0;
> - }
> - else {
> + } else {
> cp = strchr(base + current + 1, '/');
> if (!cp)
> die("oops in prep_exclude");