From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 050041FA04 for ; Mon, 11 May 2020 05:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728808AbgEKFuJ (ORCPT ); Mon, 11 May 2020 01:50:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728425AbgEKFuI (ORCPT ); Mon, 11 May 2020 01:50:08 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1D54C061A0E for ; Sun, 10 May 2020 22:50:07 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id 50so8718121wrc.11 for ; Sun, 10 May 2020 22:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=AAxY8j945f69v90NhqlHuUZ/gMyEzGE+f4u2VTugB6k=; b=XltBJSxIXJ6mJWzelJkY3ifw6f4TwitjTrK09uCxEZaLnWpRJEUYLxT2dhFNlNTFt+ v3bWm1lkQBt4g4oWPEQhen/6VmEQpKjg/ZRYKxCZ/TUAMLI5RecZV+cOcxihOlpltpDp Ovf6bfRsJ8jJBivkzZDYmXF7mi8bvzrr84P5BdUav+/2q4OqKwlD8dEXLqBSQ+97bFWN 9975t+qJnnOdI1Mxsdn4xntcz6DWEl2ezcSmHBD/qKOecYJvpvpiYggl7WEXn26mVS3Y PO9FV0kgtGseQHQPIiBDQ+FmDMXHlylZ9J1qa9awrwBmotk+JXhy7fjTh2BaJWvjhsTX 4OIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=AAxY8j945f69v90NhqlHuUZ/gMyEzGE+f4u2VTugB6k=; b=NFovEWkIzmMbbOE6U0soWpk5iusgO1EtVpsRD50ApWmlgBV9c7BgvEHn18+X1jz4bW /6TjtM5F3LuP3abzloSq50k3l7mQn9gjJlt4dqZjBxSmmNNKbIRsJss73HfZIvn9cNZq Kv1W6RrZrb8HZYMCdCIGswF4qppnGeeClLSXmLLnoNFNQqRXk0Wi4mWFrUZeBDDzKrQq ndDuemU55M3phrWI9czy3TR4AZwsMTDeevOLIJz2rwUsEmx01GmEZH9E204Dm9N0veeh SJ/AxjXzGbQxbjszbonETte6o8vT4ufOwS8Le3CFfrJyj88xRDlUfQuV/iYhbcr1KtIQ fKZw== X-Gm-Message-State: AGi0PuZXiIyc+EWcAFVg2QKdKznNXHoIpqbUpfZt/Z0E9b8C+gSU41ia uxEZcnnSeD4mFefrmIEq3c6fvbXs X-Google-Smtp-Source: APiQypINsY5LVtaYBNcGhDoD5FLWnddH7Ab14PBqbB5AgjVuN/rSINypizEkS9wgIXHyJzPqvceAPw== X-Received: by 2002:adf:f84c:: with SMTP id d12mr663080wrq.248.1589176206607; Sun, 10 May 2020 22:50:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r11sm4382399wro.15.2020.05.10.22.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 22:50:05 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Tom Clarkson via GitGitGadget" Date: Mon, 11 May 2020 05:49:58 +0000 Subject: [PATCH 4/7] subtree: add git subtree map command 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 , Tom Clarkson , Tom Clarkson Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Tom Clarkson Adds an entry to the subtree cache so that subsequent split runs can skip any commits that turn out to be problematic. Signed-off-by: Tom Clarkson --- contrib/subtree/git-subtree.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 90f92f4e949..f8ae1283cd3 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -15,6 +15,7 @@ git subtree merge --prefix= git subtree pull --prefix= git subtree push --prefix= git subtree split --prefix= +git subtree map --prefix= -- h,help show the help q quiet @@ -161,7 +162,7 @@ command="$1" shift case "$command" in -add|merge|pull) +add|merge|pull|map) default= ;; split|push) @@ -192,7 +193,8 @@ dir="$(dirname "$prefix/.")" if test "$command" != "pull" && test "$command" != "add" && - test "$command" != "push" + test "$command" != "push" && + test "$command" != "map" then revs=$(git rev-parse $default --revs-only "$@") || exit $? dirs=$(git rev-parse --no-revs --no-flags "$@") || exit $? @@ -795,6 +797,21 @@ cmd_add_commit () { say "Added dir '$dir'" } +cmd_map () { + oldrev="$1" + newrev="$2" + + if test -z "$oldrev" + then + die "You must provide a revision to map" + fi + + cache_setup || exit $? + cache_set "$oldrev" "$newrev" + + say "Mapped $oldrev => $newrev" +} + cmd_split () { debug "Splitting $dir..." cache_setup || exit $? -- gitgitgadget