[1/7] subtree: handle multiple parents passed to cache_miss

Message ID	74fa6704905d5fa4b60adb2eefa0708223010e94.1589176201.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=tgTL=6Z=vger.kernel.org=git-owner@kernel.org> Message-Id: <74fa6704905d5fa4b60adb2eefa0708223010e94.1589176201.git.gitgitgadget@gmail.com> In-Reply-To: <pull.493.git.1589176201.gitgitgadget@gmail.com> References: <pull.493.git.1589176201.gitgitgadget@gmail.com> From: "Tom Clarkson via GitGitGadget" <gitgitgadget@gmail.com> Date: Mon, 11 May 2020 05:49:55 +0000 Subject: [PATCH 1/7] subtree: handle multiple parents passed to cache_miss Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Avery Pennarun <apenwarr@gmail.com>, Tom Clarkson <tom@tqclarkson.com>, Tom Clarkson <tom@tqclarkson.com> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	subtree: Fix handling of complex history \| expand [0/7] subtree: Fix handling of complex history [1/7] subtree: handle multiple parents passed to cache_miss [2/7] subtree: exclude commits predating add from recursive processing [3/7] subtree: persist cache between split runs [4/7] subtree: add git subtree map command [5/7] subtree: add git subtree use and ignore commands [6/7] subtree: more robustly distinguish subtree and mainline commits [7/7] subtree: document new subtree commands

Message ID

74fa6704905d5fa4b60adb2eefa0708223010e94.1589176201.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Message-Id: 
 <74fa6704905d5fa4b60adb2eefa0708223010e94.1589176201.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.493.git.1589176201.gitgitgadget@gmail.com>
References: <pull.493.git.1589176201.gitgitgadget@gmail.com>
From: "Tom Clarkson via GitGitGadget" <gitgitgadget@gmail.com>
Date: Mon, 11 May 2020 05:49:55 +0000
Subject: [PATCH 1/7] subtree: handle multiple parents passed to cache_miss
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Avery Pennarun <apenwarr@gmail.com>,
        Tom Clarkson <tom@tqclarkson.com>,
        Tom Clarkson <tom@tqclarkson.com>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

subtree: Fix handling of complex history | expand

Commit Message

John Cai via GitGitGadget May 11, 2020, 5:49 a.m. UTC

From: Tom Clarkson <tom@tqclarkson.com>

Signed-off-by: Tom Clarkson <tom@tqclarkson.com>
---
 contrib/subtree/git-subtree.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 868e18b9a1a..9867718503c 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -238,7 +238,7 @@  cache_miss () {
 }
 
 check_parents () {
-	missed=$(cache_miss "$1")
+	missed=$(cache_miss $1)
 	local indent=$(($2 + 1))
 	for miss in $missed
 	do

[1/7] subtree: handle multiple parents passed to cache_miss

Commit Message

Patch