From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DE63220387 for ; Tue, 18 Jul 2017 19:06:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752313AbdGRTGJ (ORCPT ); Tue, 18 Jul 2017 15:06:09 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:34807 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752213AbdGRTFv (ORCPT ); Tue, 18 Jul 2017 15:05:51 -0400 Received: by mail-pg0-f41.google.com with SMTP id 123so17589457pgj.1 for ; Tue, 18 Jul 2017 12:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NVVixA/j/5tse9KSBVYhkAUDy29OUTBDv7D58CUjQzc=; b=c16H4+rMdFHQgOpZut4KxG9SCuT66ktrOj9ENIrHVIUW6HdVAjpxYdJWVPXFPMhDNp FModNb7SCQ5VAUjqMJLICsc1wTCawk2Y+T2ULpQDfw2xfGb93AmFpb5eN6/vudyhy1/y xTh1L2y/lKwUwVsulS1S1tPkRS/MDAQTLjLnOO23BtgFr0NgsWt1c+49Lat61WaAnzb5 9HsIcGttrAWtochlabgzdMgNWeDLgwOYY01vRNFPlkTipnafTejSkFl5pFIUhBruJenc NTRM/lwQW1dwRPrA28FLCT3AP/yTA/CtvKvSnENskLQLBuSoyfgaHxY2nCnLEI8df4dQ s+Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NVVixA/j/5tse9KSBVYhkAUDy29OUTBDv7D58CUjQzc=; b=qtpkS8Kz4kOInSxXQU9UUy1HvhOw6gUBYFWfspPjkvNG5FqG55BUr2WRDmlqN3ZUnk IIL3VHZf2G0iSyb1inTJ4uDrDfNaxYBYtdfF9S/D//qcq36WaSss6H2pvLr9QWQ9IlpG drl+9+t4qmGPZWdqVEs3zynpweSQawE+/v8AXTz4L6sJki/quguYNv/oS0EuwVtJMmli OILta4C3QFCMLD4x1UublsfFRPYCpWeBL4kW9ijzOg/FQmy4Ol4pPU3F5MSGbmpy6ayk TiNNeMk8XIxGsJGSNUkdOrxdxSewP5CKoWNm7wIdkN1HT7uoTcdZCFHtBWBdMm3HMXyO w9/A== X-Gm-Message-State: AIVw113XAMFkwBb62i7yhA44Y4keQkQWxpqLSt6Y40tg0qQr28H7ATGh pU84zrUg+dvkAf5YMST8UA== X-Received: by 10.98.155.133 with SMTP id e5mr3296971pfk.186.1500404749806; Tue, 18 Jul 2017 12:05:49 -0700 (PDT) Received: from roshar.svl.corp.google.com ([100.96.218.30]) by smtp.gmail.com with ESMTPSA id t11sm6894649pfi.66.2017.07.18.12.05.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 12:05:48 -0700 (PDT) From: Brandon Williams To: git@vger.kernel.org Cc: sbeller@google.com, jrnieder@gmail.com, gitster@pobox.com, Brandon Williams Subject: [PATCH v3 07/10] submodule: check for unstaged .gitmodules outside of config parsing Date: Tue, 18 Jul 2017 12:05:24 -0700 Message-Id: <20170718190527.78049-8-bmwill@google.com> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog In-Reply-To: <20170718190527.78049-1-bmwill@google.com> References: <20170714222826.81148-1-bmwill@google.com> <20170718190527.78049-1-bmwill@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Teach 'is_staging_gitmodules_ok()' to be able to determine in the '.gitmodules' file has unstaged changes based on the passed in index instead of relying on a global varible which is set during the submodule-config parsing. Signed-off-by: Brandon Williams --- builtin/mv.c | 2 +- builtin/rm.c | 2 +- submodule.c | 32 +++++++++++++++++--------------- submodule.h | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index dcf6736b5..94fbaaa5d 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -81,7 +81,7 @@ static void prepare_move_submodule(const char *src, int first, struct strbuf submodule_dotgit = STRBUF_INIT; if (!S_ISGITLINK(active_cache[first]->ce_mode)) die(_("Directory %s is in index and no submodule?"), src); - if (!is_staging_gitmodules_ok()) + if (!is_staging_gitmodules_ok(&the_index)) die(_("Please stage your changes to .gitmodules or stash them to proceed")); strbuf_addf(&submodule_dotgit, "%s/.git", src); *submodule_gitfile = read_gitfile(submodule_dotgit.buf); diff --git a/builtin/rm.c b/builtin/rm.c index 52826d137..4057e73fa 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -286,7 +286,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) list.entry[list.nr].name = xstrdup(ce->name); list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode); if (list.entry[list.nr++].is_submodule && - !is_staging_gitmodules_ok()) + !is_staging_gitmodules_ok(&the_index)) die (_("Please stage your changes to .gitmodules or stash them to proceed")); } diff --git a/submodule.c b/submodule.c index b1965290f..46ec04d7c 100644 --- a/submodule.c +++ b/submodule.c @@ -37,18 +37,25 @@ static struct oid_array ref_tips_after_fetch; static int gitmodules_is_unmerged; /* - * This flag is set if the .gitmodules file had unstaged modifications on - * startup. This must be checked before allowing modifications to the - * .gitmodules file with the intention to stage them later, because when - * continuing we would stage the modifications the user didn't stage herself - * too. That might change in a future version when we learn to stage the - * changes we do ourselves without staging any previous modifications. + * Check if the .gitmodules file has unstaged modifications. This must be + * checked before allowing modifications to the .gitmodules file with the + * intention to stage them later, because when continuing we would stage the + * modifications the user didn't stage herself too. That might change in a + * future version when we learn to stage the changes we do ourselves without + * staging any previous modifications. */ -static int gitmodules_is_modified; - -int is_staging_gitmodules_ok(void) +int is_staging_gitmodules_ok(const struct index_state *istate) { - return !gitmodules_is_modified; + int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE)); + + if ((pos >= 0) && (pos < istate->cache_nr)) { + struct stat st; + if (lstat(GITMODULES_FILE, &st) == 0 && + ce_match_stat(istate->cache[pos], &st, 0) & DATA_CHANGED) + return 0; + } + + return 1; } /* @@ -231,11 +238,6 @@ void gitmodules_config(void) !memcmp(ce->name, ".gitmodules", 11)) gitmodules_is_unmerged = 1; } - } else if (pos < active_nr) { - struct stat st; - if (lstat(".gitmodules", &st) == 0 && - ce_match_stat(active_cache[pos], &st, 0) & DATA_CHANGED) - gitmodules_is_modified = 1; } if (!gitmodules_is_unmerged) diff --git a/submodule.h b/submodule.h index 29a1ecd19..b14660585 100644 --- a/submodule.h +++ b/submodule.h @@ -33,7 +33,7 @@ struct submodule_update_strategy { }; #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} -extern int is_staging_gitmodules_ok(void); +extern int is_staging_gitmodules_ok(const struct index_state *istate); extern int update_path_in_gitmodules(const char *oldpath, const char *newpath); extern int remove_path_from_gitmodules(const char *path); extern void stage_updated_gitmodules(void); -- 2.13.2.932.g7449e964c-goog