From: "James Limbouris via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
James Limbouris <james@digitalmatter.com>,
James Limbouris <james@digitalmatter.com>
Subject: [PATCH v3] subtree: fix argument handling in check_parents
Date: Mon, 06 Dec 2021 02:45:42 +0000 [thread overview]
Message-ID: <pull.1086.v3.git.1638758742741.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1086.v2.git.1638424290015.gitgitgadget@gmail.com>
From: James Limbouris <james@digitalmatter.com>
check_parents was taking all of its arguments as a single string,
and erroneously passing them to cache_miss as a single string. For
commits with a single parent this would succeed, but whenever a merge
commit was processed, cache_miss would be passed "parent1 parent2"
instead of "parent1" "parent2" and fail, leading to unecessary rechecks
of the parent commits.
For consistency, take multiple arguments in check_parents,
and pass all of them to cache_miss separately.
Signed-off-by: James Limbouris <james@digitalmatter.com>
---
subtree: fix argument handling in check_parents
> I agree with this. I'll mark the topic as "Expecting a reroll" in the
> next "What's cooking" report, so that we do not forget that we are
> waiting for such an improved description in the log message.
Thanks for the feedback - log message has been amended.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1086%2Fjamesl-dm%2Fmaint-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1086/jamesl-dm/maint-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1086
Range-diff vs v2:
1: 1198a84995b ! 1: f734ca9d276 subtree: fix argument handling in check_parents
@@ Commit message
subtree: fix argument handling in check_parents
check_parents was taking all of its arguments as a single string,
- and erroneously passing them to cache_miss as a single string.
- cache_miss would then fail, and the spurious cache misses it produced
- would hurt performance.
+ and erroneously passing them to cache_miss as a single string. For
+ commits with a single parent this would succeed, but whenever a merge
+ commit was processed, cache_miss would be passed "parent1 parent2"
+ instead of "parent1" "parent2" and fail, leading to unecessary rechecks
+ of the parent commits.
For consistency, take multiple arguments in check_parents,
and pass all of them to cache_miss separately.
contrib/subtree/git-subtree.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7f767b5c38f..71f1fd94bde 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -296,10 +296,9 @@ cache_miss () {
done
}
-# Usage: check_parents PARENTS_EXPR
+# Usage: check_parents [REVS...]
check_parents () {
- assert test $# = 1
- missed=$(cache_miss "$1") || exit $?
+ missed=$(cache_miss "$@") || exit $?
local indent=$(($indent + 1))
for miss in $missed
do
@@ -753,7 +752,7 @@ process_split_commit () {
fi
createcount=$(($createcount + 1))
debug "parents: $parents"
- check_parents "$parents"
+ check_parents $parents
newparents=$(cache_get $parents) || exit $?
debug "newparents: $newparents"
base-commit: e9d7761bb94f20acc98824275e317fa82436c25d
--
gitgitgadget
next prev parent reply other threads:[~2021-12-06 2:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 2:06 [PATCH] subtree: fix argument handling in check_parents James Limbouris via GitGitGadget
2021-12-01 23:04 ` Junio C Hamano
2021-12-02 5:51 ` [PATCH v2] " James Limbouris via GitGitGadget
2021-12-06 2:45 ` James Limbouris via GitGitGadget [this message]
2021-12-08 2:11 ` [PATCH v4] " James Limbouris via GitGitGadget
2022-01-04 12:21 ` Johannes Schindelin
2022-01-04 20:04 ` Junio C Hamano
2021-12-03 15:22 ` [PATCH] " Johannes Schindelin
2021-12-03 20:02 ` Junio C Hamano
2021-12-07 21:45 ` Johannes Schindelin
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=pull.1086.v3.git.1638758742741.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=james@digitalmatter.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.