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

Re: [PATCH] Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 22, 2013, 17:21 UTC
Message-ID
<xmqq38ntusq6.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1382150484-13207-1-git-send-email-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
Show 14 quoted lines
> When parse_pathspec() is called with no paths, the behavior could be
> either return no paths, or return one path that is cwd. Some commands
> do the former, some the latter. parse_pathspec() itself does not make
> either the default and requires the caller to specify either flag if
> it may run into this situation.
>
> I've grep'd through all parse_pathspec() call sites. Some pass
> neither, but those are guaranteed never pass empty path to
> parse_pathspec(). There are two call sites that may pass empty path
> and are fixed with this patch.
>
> Reported-by: Antoine Pelisse <apelisse@gmail.com>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
Thanks.
Show 31 quoted lines
>  line-log.c | 3 ++-
>  revision.c | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/line-log.c b/line-log.c
> index 8b6e497..717638b 100644
> --- a/line-log.c
> +++ b/line-log.c
> @@ -760,7 +760,8 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list
>  			r = r->next;
>  		}
>  		paths[count] = NULL;
> -		parse_pathspec(&rev->diffopt.pathspec, 0, 0, "", paths);
> +		parse_pathspec(&rev->diffopt.pathspec, 0,
> +			       PATHSPEC_PREFER_FULL, "", paths);
>  		free(paths);
>  	}
>  }
> diff --git a/revision.c b/revision.c
> index 0173e01..dd994e9 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -1372,7 +1372,8 @@ static void prepare_show_merge(struct rev_info *revs)
>  			i++;
>  	}
>  	free_pathspec(&revs->prune_data);
> -	parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC, 0, "", prune);
> +	parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC,
> +		       PATHSPEC_PREFER_FULL, "", prune);
>  	revs->limited = 1;
>  }
Previous: Nguyễn Thái Ngọc DuyNext: Junio C Hamano
Message 3 of 4 in “BUG: PATHSPEC_PREFER_CWD requires arguments”
  1. Antoine PelisseOct 18, 2013
  2. Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flagsNguyễn Thái Ngọc Duy, Oct 19, 2013
  3. Junio C HamanoOct 22, 2013
  4. Junio C HamanoOct 22, 2013

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.