From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Carlos Martín Nieto" <cmn@elego.de>,
"Michael Schubert" <mschub@elegosoft.com>,
"Johan Herland" <johan@herland.net>, "Jeff King" <peff@peff.net>,
"Marc Branchaud" <marcnarc@xiplink.com>,
"Nicolas Pitre" <nico@fluxnic.net>,
"John Szakmeister" <john@szakmeister.net>,
"Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 15/23] fetch, remote: properly convey --no-prune options to subprocesses
Date: Wed, 30 Oct 2013 06:33:04 +0100 [thread overview]
Message-ID: <1383111192-23780-16-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1383111192-23780-1-git-send-email-mhagger@alum.mit.edu>
If --no-prune is passed to one of the following commands:
git fetch --all
git fetch --multiple
git fetch --recurse-submodules
git remote update
then it must also be passed to the "fetch" subprocesses that those
commands use to do their work. Otherwise there might be a fetch.prune
or remote.<name>.prune configuration setting that causes pruning to
occur, contrary to the user's express wish.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
builtin/fetch.c | 4 ++--
builtin/remote.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 1514b90..5ddb9af 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -936,8 +936,8 @@ static void add_options_to_argv(struct argv_array *argv)
{
if (dry_run)
argv_array_push(argv, "--dry-run");
- if (prune > 0)
- argv_array_push(argv, "--prune");
+ if (prune != -1)
+ argv_array_push(argv, prune ? "--prune" : "--no-prune");
if (update_head_ok)
argv_array_push(argv, "--update-head-ok");
if (force)
diff --git a/builtin/remote.c b/builtin/remote.c
index bffe2f9..f532f35 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1371,7 +1371,7 @@ static int get_remote_default(const char *key, const char *value, void *priv)
static int update(int argc, const char **argv)
{
- int i, prune = 0;
+ int i, prune = -1;
struct option options[] = {
OPT_BOOL('p', "prune", &prune,
N_("prune remotes after fetching")),
@@ -1386,8 +1386,8 @@ static int update(int argc, const char **argv)
argv_array_push(&fetch_argv, "fetch");
- if (prune)
- argv_array_push(&fetch_argv, "--prune");
+ if (prune != -1)
+ argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune");
if (verbose)
argv_array_push(&fetch_argv, "-v");
argv_array_push(&fetch_argv, "--multiple");
--
1.8.4.1
next prev parent reply other threads:[~2013-10-30 5:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 5:32 [PATCH v2 00/23] Change semantics of "fetch --tags" Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 01/23] t5510: use the correct tag name in test Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 02/23] t5510: prepare test refs more straightforwardly Michael Haggerty
2013-10-30 10:57 ` Ramkumar Ramachandra
2013-10-30 17:41 ` Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 03/23] t5510: check that "git fetch --prune --tags" does not prune branches Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 04/23] api-remote.txt: correct section "struct refspec" Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 05/23] get_ref_map(): rename local variables Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 06/23] builtin/fetch.c: reorder function definitions Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 07/23] get_expanded_map(): add docstring Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 08/23] get_expanded_map(): avoid memory leak Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 09/23] fetch: only opportunistically update references based on command line Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 10/23] fetch --tags: fetch tags *in addition to* other stuff Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 11/23] fetch --prune: prune only based on explicit refspecs Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 12/23] query_refspecs(): move some constants out of the loop Michael Haggerty
2013-10-30 11:05 ` Ramkumar Ramachandra
2013-10-30 17:31 ` Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 13/23] builtin/remote.c: reorder function definitions Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 14/23] builtin/remote.c:update(): use struct argv_array Michael Haggerty
2013-10-30 5:33 ` Michael Haggerty [this message]
2013-10-30 5:33 ` [PATCH v2 16/23] fetch-options.txt: simplify ifdef/ifndef/endif usage Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 17/23] git-fetch.txt: improve description of tag auto-following Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 18/23] ref_remove_duplicates(): avoid redundant bisection Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 19/23] t5536: new test of refspec conflicts when fetching Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 20/23] ref_remove_duplicates(): simplify loop logic Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 21/23] ref_remote_duplicates(): extract a function handle_duplicate() Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 22/23] handle_duplicate(): mark error message for translation Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 23/23] fetch: improve the error messages emitted for conflicting refspecs Michael Haggerty
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=1383111192-23780-16-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=john@szakmeister.net \
--cc=marcnarc@xiplink.com \
--cc=mschub@elegosoft.com \
--cc=nico@fluxnic.net \
--cc=peff@peff.net \
/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).