git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Elijah Newren" <newren@gmail.com>,
	"Jonathan Tan" <jonathantanmy@google.com>,
	"Calvin Wan" <calvinwan@google.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v4 0/5] Fix dual rename into each other plus conflicting adds
Date: Wed, 06 Jul 2022 09:52:45 -0700	[thread overview]
Message-ID: <xmqqwncqi3oi.fsf@gitster.g> (raw)
In-Reply-To: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Tue, 05 Jul 2022 01:33:38 +0000")

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> This series adds some testcases based on the tensorflow repository issue
> reported by Glen Choo at [1], demonstrating bugs in both the ort and
> recursive strategies. It also provides a fix for the ort strategy.
>
> Changes since v3:
>
>  * Remove use of for-initializer

I missed them while queuing the previous round and updates look OK.

I however personally find the resulting code irritating to read.
The counter 'i', which never is used for two purposes at the same
time, has multiple "hiding" declarations in this function, in
addition to its top-level declaration.  It forces the readers to
think about which variable each reference of 'i' talks about, and
more importantly, if the value in outer 'i' of its last use, after
an inner 'i' is used, matters.

Will queue.

Thanks.

      parent reply	other threads:[~2022-07-06 16:52 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-22  4:20 [PATCH 0/3] Fix dual rename into each other plus conflicting adds Elijah Newren via GitGitGadget
2022-06-22  4:20 ` [PATCH 1/3] t6423: add tests of dual directory rename plus add/add conflict Elijah Newren via GitGitGadget
2022-06-27 18:20   ` Jonathan Tan
2022-06-30  0:06     ` Elijah Newren
2022-06-30 22:32       ` Jonathan Tan
2022-07-01  2:57         ` Elijah Newren
2022-06-27 22:30   ` Calvin Wan
2022-06-30  0:07     ` Elijah Newren
2022-06-22  4:20 ` [PATCH 2/3] merge-ort: shuffle the computation and cleanup of potential collisions Elijah Newren via GitGitGadget
2022-06-27 18:48   ` Jonathan Tan
2022-06-27 21:04     ` Calvin Wan
2022-06-30  0:05       ` Elijah Newren
2022-06-22  4:20 ` [PATCH 3/3] merge-ort: fix issue with dual rename and add/add conflict Elijah Newren via GitGitGadget
2022-06-27 18:47   ` Jonathan Tan
2022-06-30  0:05     ` Elijah Newren
2022-07-06 17:25       ` Jonathan Tan
2022-06-22  4:36 ` [PATCH 0/3] Fix dual rename into each other plus conflicting adds Elijah Newren
2022-06-30  6:57 ` [PATCH v2 " Elijah Newren via GitGitGadget
2022-06-30  6:57   ` [PATCH v2 1/3] t6423: add tests of dual directory rename plus add/add conflict Elijah Newren via GitGitGadget
2022-06-30 10:21     ` Ævar Arnfjörð Bjarmason
2022-07-01  2:57       ` Elijah Newren
2022-07-01  9:29         ` Ævar Arnfjörð Bjarmason
2022-06-30  6:57   ` [PATCH v2 2/3] merge-ort: shuffle the computation and cleanup of potential collisions Elijah Newren via GitGitGadget
2022-06-30 10:28     ` Ævar Arnfjörð Bjarmason
2022-07-01  3:02       ` Elijah Newren
2022-06-30  6:57   ` [PATCH v2 3/3] merge-ort: fix issue with dual rename and add/add conflict Elijah Newren via GitGitGadget
2022-06-30 10:31     ` Ævar Arnfjörð Bjarmason
2022-07-01  3:03       ` Elijah Newren
2022-07-01  5:23   ` [PATCH v3 0/5] Fix dual rename into each other plus conflicting adds Elijah Newren via GitGitGadget
2022-07-01  5:23     ` [PATCH v3 1/5] t6423: add tests of dual directory rename plus add/add conflict Elijah Newren via GitGitGadget
2022-07-01  5:23     ` [PATCH v3 2/5] merge-ort: small cleanups of check_for_directory_rename Elijah Newren via GitGitGadget
2022-07-01  5:23     ` [PATCH v3 3/5] merge-ort: make a separate function for freeing struct collisions Elijah Newren via GitGitGadget
2022-07-01  5:23     ` [PATCH v3 4/5] merge-ort: shuffle the computation and cleanup of potential collisions Elijah Newren via GitGitGadget
2022-07-01  9:16       ` Ævar Arnfjörð Bjarmason
2022-07-25 12:00         ` C99 "for (int ..." form on "master" (was: [PATCH v3 4/5] merge-ort: shuffle the computation and cleanup of potential collisions) Ævar Arnfjörð Bjarmason
2022-07-26  2:14           ` Elijah Newren
2022-07-26  4:48             ` C99 "for (int ..." form on "master" Junio C Hamano
2022-07-01  5:23     ` [PATCH v3 5/5] merge-ort: fix issue with dual rename and add/add conflict Elijah Newren via GitGitGadget
2022-07-05  1:33     ` [PATCH v4 0/5] Fix dual rename into each other plus conflicting adds Elijah Newren via GitGitGadget
2022-07-05  1:33       ` [PATCH v4 1/5] t6423: add tests of dual directory rename plus add/add conflict Elijah Newren via GitGitGadget
2022-07-05  1:33       ` [PATCH v4 2/5] merge-ort: small cleanups of check_for_directory_rename Elijah Newren via GitGitGadget
2022-07-05  1:33       ` [PATCH v4 3/5] merge-ort: make a separate function for freeing struct collisions Elijah Newren via GitGitGadget
2022-07-05  1:33       ` [PATCH v4 4/5] merge-ort: shuffle the computation and cleanup of potential collisions Elijah Newren via GitGitGadget
2022-07-05  1:33       ` [PATCH v4 5/5] merge-ort: fix issue with dual rename and add/add conflict Elijah Newren via GitGitGadget
2022-07-06 16:52       ` Junio C Hamano [this message]

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

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

  git send-email \
    --in-reply-to=xmqqwncqi3oi.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=calvinwan@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.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. 
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 NNTP newsgroup(s).