Re: [PATCH v2 2/2] [GSoC] diff:use is_dot_or_dotdot() in code
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 19, 2014, 08:21 UTC
- Message-ID
- <CAPig+cQF8p0qeNWhGOZ1tqzvEaUGwSd4S0-7FxcuXCvKNE33Kw@mail.gmail.com>
- In-Reply-To
- <1395210578-1532-2-git-send-email-ba.bourn@gmail.com>
On Wed, Mar 19, 2014 at 2:29 AM, Brian Bourn <ba.bourn@gmail.com> wrote:
> Subject: diff:use is_dot_or_dotdot() in code
Wrong subject. See below.
> From: Brian Bourn <ba.bourn@gmail.com>
Drop this. "git am" will grab your name and address automatically from the email header when applying the patch.
> Subject: replace manual "."/".." check with is_dot_or_dotdot()
This should be the actual subject of this email; and the old, less informative subject, which is still present, should be dropped. Stated differently, make this text the first line of your commit message. "git format-patch" will automatically extract that line as the email's Subject:, and "git am" will convert the Subject: back to the first line of the commit message (without the "Subject:" prefix) when applying the patch.
Other than that, the patch looks fine.
Show 29 quoted lines
> Signed-off-by: Brian Bourn <ba.bourn@gmail.com>
> ---
> Part 2 of my GSoC submission where the actual change is made
> diff-no-index.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/diff-no-index.c b/diff-no-index.c
> index ec51106..c554691 100644
> --- a/diff-no-index.c
> +++ b/diff-no-index.c
> @@ -15,6 +15,7 @@
> #include "log-tree.h"
> #include "builtin.h"
> #include "string-list.h"
> +#include "dir.h"
>
> static int read_directory_contents(const char *path, struct string_list *list)
> {
> @@ -25,7 +26,7 @@ static int read_directory_contents(const char *path, struct string_list *list)
> return error("Could not open directory %s", path);
>
> while ((e = readdir(dir)))
> - if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
> + if (!is_dot_or_dotdot(e->d_name))
> string_list_insert(list, e->d_name);
>
> closedir(dir);
> --
> 1.9.0