From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Tan <jonathantanmy@google.com>,
me@ttaylorr.com, git@vger.kernel.org, newren@gmail.com
Subject: Re: [PATCH v2 2/2] shallow.c: use '{commit,rollback}_shallow_file'
Date: Fri, 24 Apr 2020 11:13:01 -0600 [thread overview]
Message-ID: <20200424171301.GB61470@syl.local> (raw)
In-Reply-To: <xmqqr1weey0g.fsf@gitster.c.googlers.com>
On Thu, Apr 23, 2020 at 01:40:47PM -0700, Junio C Hamano wrote:
> Jonathan Tan <jonathantanmy@google.com> writes:
>
> >> Replace each instance of 'commit_lock_file' and 'rollback_lock_file'
> >> with 'commit_shallow_file' and 'rollback_shallow_file' when the lock
> >> being held is over the '.git/shallow' file.
> >
> > I think Jonathan Nieder already covered 1/2 so I'll just close the loop
> > on this patch. There was one potential issue in that a previous version
> > of this patch also called reset_repository_shallow() in
> > setup_alternate_shallow(), but this version does not. But after looking
> > into it, this looks fine - setup_alternate_shallow() deals with a
> > passed-in alternate_shallow_file variable, which is different from the
> > r->parsed_objects->alternate_shallow_file that is_repository_shallow()
> > uses to set the global variables. (I might have confused the two during
> > earlier reviews.) Also, setup_alternate_shallow() is called either
> > before any shallow processing (empirically demonstrating that no
> > resetting is needed in this case, because it has been working), or right
> > before a commit or rollback of the lock file (so the global variables
> > are being reset anyway, so we do not need to call
> > reset_repository_shallow()).
> >
> > So,
> > Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
>
> Thanks for a review.
>
> And of course, thanks Taylor. Will queue.
Thanks, both. I'll send some more patches on top to introduce a
'shallow_lock' type.
Thanks,
Taylor
next prev parent reply other threads:[~2020-04-24 17:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 18:09 [PATCH] shallow.c: use 'reset_repository_shallow' when appropriate Taylor Blau
2020-04-21 20:41 ` Junio C Hamano
2020-04-21 20:45 ` Taylor Blau
2020-04-21 20:52 ` Junio C Hamano
2020-04-21 22:21 ` Taylor Blau
2020-04-21 23:06 ` Junio C Hamano
2020-04-22 18:05 ` Jonathan Tan
2020-04-22 18:02 ` Jonathan Tan
2020-04-22 18:15 ` Junio C Hamano
2020-04-23 0:14 ` Taylor Blau
2020-04-23 0:25 ` [PATCH v2 0/2] shallow.c: reset shallow-ness after updating Taylor Blau
2020-04-23 0:25 ` [PATCH v2 1/2] t5537: use test_write_lines, indented heredocs for readability Taylor Blau
2020-04-23 1:14 ` Jonathan Nieder
2020-04-24 17:11 ` Taylor Blau
2020-04-24 17:17 ` Jonathan Nieder
2020-04-24 20:45 ` Junio C Hamano
2020-04-23 0:25 ` [PATCH v2 2/2] shallow.c: use '{commit,rollback}_shallow_file' Taylor Blau
2020-04-23 1:23 ` Jonathan Nieder
2020-04-23 18:09 ` Jonathan Tan
2020-04-23 20:40 ` Junio C Hamano
2020-04-24 17:13 ` Taylor Blau [this message]
2020-06-03 3:42 ` Jonathan Nieder
2020-06-03 4:52 ` Taylor Blau
2020-06-03 5:16 ` Taylor Blau
2020-06-03 13:08 ` Derrick Stolee
2020-06-03 19:26 ` Taylor Blau
2020-06-03 21:23 ` Jonathan Nieder
2020-06-03 20:51 ` Jonathan Nieder
2020-06-03 22:14 ` Taylor Blau
2020-06-03 23:06 ` Jonathan Nieder
2020-06-04 17:45 ` Taylor Blau
2020-04-23 19:05 ` [PATCH] shallow.c: use 'reset_repository_shallow' when appropriate Junio C Hamano
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=20200424171301.GB61470@syl.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=newren@gmail.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).