git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH v4 16/16] refs.c: reindent get_submodule_ref_store()
Date: Sat, 9 Sep 2017 08:41:54 +0200	[thread overview]
Message-ID: <a445a47f-9fe9-1c56-8e14-eb5aafbdbb0f@alum.mit.edu> (raw)
In-Reply-To: <20170823123704.16518-17-pclouds@gmail.com>

On 08/23/2017 02:37 PM, Nguyễn Thái Ngọc Duy wrote:
> With the new "if (!submodule) return NULL;" code added in the previous
> commit, we don't need to check if submodule is not NULL anymore.
> 
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  refs.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/refs.c b/refs.c
> index a0c5078901..206af61d62 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1590,13 +1590,11 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
>  	if (!submodule)
>  		return NULL;
>  
> -	if (submodule) {
> -		len = strlen(submodule);
> -		while (len && is_dir_sep(submodule[len - 1]))
> -			len--;
> -		if (!len)
> -			return NULL;
> -	}
> +	len = strlen(submodule);
> +	while (len && is_dir_sep(submodule[len - 1]))
> +		len--;
> +	if (!len)
> +		return NULL;
>  
>  	if (submodule[len])
>  		/* We need to strip off one or more trailing slashes */
> 

Now I'm confused. Is it still allowed to call
`get_submodule_ref_store(NULL)`? If not, then the previous commit should
probably do

	if (!submdule)
		BUG(...);

Either way, it seems like it would be natural to combine this commit
with the previous one.

Michael

  reply	other threads:[~2017-09-09  6:42 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-23 12:36 [PATCH v4 00/16] Fix git-gc losing objects in multi worktree Nguyễn Thái Ngọc Duy
2017-08-23 12:36 ` [PATCH v4 01/16] revision.h: new flag in struct rev_info wrt. worktree-related refs Nguyễn Thái Ngọc Duy
2017-08-23 12:36 ` [PATCH v4 02/16] refs.c: use is_dir_sep() in resolve_gitlink_ref() Nguyễn Thái Ngọc Duy
2017-08-23 19:14   ` Stefan Beller
2017-09-06 11:08     ` Duy Nguyen
2017-09-06 17:41       ` Stefan Beller
2017-08-23 12:36 ` [PATCH v4 03/16] revision.c: refactor add_index_objects_to_pending() Nguyễn Thái Ngọc Duy
2017-08-23 12:36 ` [PATCH v4 04/16] revision.c: --indexed-objects add objects from all worktrees Nguyễn Thái Ngọc Duy
2017-08-23 19:25   ` Stefan Beller
2017-08-23 12:36 ` [PATCH v4 05/16] refs.c: refactor get_submodule_ref_store(), share common free block Nguyễn Thái Ngọc Duy
2017-08-23 19:34   ` Stefan Beller
2017-08-23 12:36 ` [PATCH v4 06/16] refs: move submodule slash stripping code to get_submodule_ref_store Nguyễn Thái Ngọc Duy
2017-09-09  5:45   ` Michael Haggerty
2017-08-23 12:36 ` [PATCH v4 07/16] refs: add refs_head_ref() Nguyễn Thái Ngọc Duy
2017-08-24 21:52   ` Junio C Hamano
2017-09-06 11:23     ` Duy Nguyen
2017-08-23 12:36 ` [PATCH v4 08/16] revision.c: use refs_for_each*() instead of for_each_*_submodule() Nguyễn Thái Ngọc Duy
2017-08-24 21:56   ` Junio C Hamano
2017-08-23 12:36 ` [PATCH v4 09/16] refs.c: move for_each_remote_ref_submodule() to submodule.c Nguyễn Thái Ngọc Duy
2017-08-23 12:36 ` [PATCH v4 10/16] refs: remove dead for_each_*_submodule() Nguyễn Thái Ngọc Duy
2017-08-23 19:45   ` Stefan Beller
2017-09-09  5:59   ` Michael Haggerty
2017-08-23 12:36 ` [PATCH v4 11/16] revision.c: --all adds HEAD from all worktrees Nguyễn Thái Ngọc Duy
2017-08-23 19:54   ` Stefan Beller
2017-09-06 11:19     ` Duy Nguyen
2017-09-06 17:43       ` Stefan Beller
2017-09-09  6:04   ` Michael Haggerty
2017-08-23 12:37 ` [PATCH v4 12/16] files-backend: make reflog iterator go through per-worktree reflog Nguyễn Thái Ngọc Duy
2017-08-24 14:13   ` Richard Maw
2017-09-09  6:30   ` Michael Haggerty
2017-08-23 12:37 ` [PATCH v4 13/16] revision.c: --reflog add HEAD reflog from all worktrees Nguyễn Thái Ngọc Duy
2017-08-23 12:37 ` [PATCH v4 14/16] rev-list: expose and document --single-worktree Nguyễn Thái Ngọc Duy
2017-08-23 20:45   ` Stefan Beller
2017-08-23 12:37 ` [PATCH v4 15/16] refs.c: remove fallback-to-main-store code get_submodule_ref_store() Nguyễn Thái Ngọc Duy
2017-09-09  6:36   ` Michael Haggerty
2017-08-23 12:37 ` [PATCH v4 16/16] refs.c: reindent get_submodule_ref_store() Nguyễn Thái Ngọc Duy
2017-09-09  6:41   ` Michael Haggerty [this message]
2017-08-25 11:21 ` [PATCH v4 00/16] Fix git-gc losing objects in multi worktree Michael J Gruber
2017-09-06 10:53   ` Duy Nguyen
2017-09-09  6:45 ` Michael Haggerty

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=a445a47f-9fe9-1c56-8e14-eb5aafbdbb0f@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=sbeller@google.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).