From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jean-Noel Avila <jn.avila@free.fr>
Subject: [PATCH] read-tree: "read-tree -m --empty" does not make sense
Date: Wed, 10 May 2017 21:31:54 -0700 [thread overview]
Message-ID: <xmqqwp9oau9x.fsf_-_@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq60h8cay3.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 10 May 2017 20:46:28 -0700")
fb1bb965 ("read-tree: deprecate syntax without tree-ish args",
2010-09-10) wanted to deprecate "git read-tree" without any tree,
which used to be the way to empty the index, and encourage use of
"git read-tree --empty" instead.
However, when used with "-m", "--empty" does not make any sense,
either, simply because merging 0 trees will result in a different
error anyway.
Omit the deprecation warning and let the code to emit real error
message diagnose the error.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Junio C Hamano <gitster@pobox.com> writes:
> Jean-Noel Avila <jn.avila@free.fr> writes:
>
>> "git read-tree -m" requires a tree argument to name the tree to be
>> merged in. Git uses a cutesy error message to say so and why:
>>
>> $ git read-tree -m
>> warning: read-tree: emptying the index with no arguments is
>> deprecated; use --empty
>> fatal: just how do you expect me to merge 0 trees?
>> $ git read-tree -m --empty
>> fatal: just how do you expect me to merge 0 trees?
>
> This shows another issue. The "emptying ... is deprecated" message
> shouldn't be given when -m is present.
>
> I am not saying that that needs to be fixed by you and/or as a part
> of this patch. Just something I noticed while reviewing the patch.
builtin/read-tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 23e212ee8c..284de743c3 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -210,7 +210,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
die("failed to unpack tree object %s", arg);
stage++;
}
- if (nr_trees == 0 && !read_empty)
+ if (!nr_trees && !read_empty && !opts.merge)
warning("read-tree: emptying the index with no arguments is deprecated; use --empty");
else if (nr_trees > 0 && read_empty)
die("passing trees as arguments contradicts --empty");
--
2.13.0-336-gf73534b083
next prev parent reply other threads:[~2017-05-11 4:32 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 16:29 [PATCH 1/4] usability: don't ask questions if no reply is required Jean-Noel Avila
2017-05-03 16:29 ` [PATCH 2/4] usability: fix am and checkout for nevermind questions Jean-Noel Avila
2017-05-03 16:51 ` Jonathan Nieder
2017-05-03 18:35 ` Jean-Noël AVILA
2017-05-03 16:29 ` [PATCH 3/4] read-tree.c: rework UI when merging no trees Jean-Noel Avila
2017-05-03 17:04 ` Jonathan Nieder
2017-05-03 18:39 ` Jean-Noël AVILA
2017-05-03 16:29 ` [PATCH 4/4] git-filter-branch: be assertative on dying message Jean-Noel Avila
2017-05-03 17:07 ` Jonathan Nieder
2017-05-03 16:47 ` [PATCH 1/4] usability: don't ask questions if no reply is required Jonathan Nieder
2017-05-03 16:58 ` Stefan Beller
2017-05-03 17:37 ` Jean-Noël AVILA
2017-05-03 21:07 ` [PATCH v2 1/3] " Jean-Noel Avila
2017-05-03 21:07 ` [PATCH v2 2/3] read-tree -m: make error message for merging 0 trees less smart aleck Jean-Noel Avila
2017-05-11 3:46 ` Junio C Hamano
2017-05-11 4:31 ` Junio C Hamano [this message]
2017-05-03 21:07 ` [PATCH v2 3/3] git-filter-branch: make the error msg when missing branch more open Jean-Noel Avila
2017-05-11 3:53 ` Junio C Hamano
2017-05-04 8:52 ` [PATCH v2 1/3] usability: don't ask questions if no reply is required Kerry, Richard
2017-05-04 9:09 ` Ævar Arnfjörð Bjarmason
2017-05-04 10:14 ` Kerry, Richard
2017-05-09 8:18 ` Jean-Noël AVILA
2017-05-09 9:21 ` Ævar Arnfjörð Bjarmason
2017-05-04 9:41 ` Jean-Noël AVILA
2017-05-11 3:16 ` Junio C Hamano
2017-05-11 10:10 ` Kerry, Richard
2017-05-11 10:28 ` Konstantin Khomoutov
2017-05-11 10:33 ` Ævar Arnfjörð Bjarmason
2017-05-11 12:06 ` [PATCH v3 " Jean-Noel Avila
2017-05-11 12:06 ` [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck Jean-Noel Avila
2017-05-11 19:08 ` Jonathan Nieder
2017-05-12 6:28 ` Junio C Hamano
2017-05-12 12:54 ` Jean-Noël AVILA
2017-05-11 12:06 ` [PATCH v3 3/3] git-filter-branch: Jean-Noel Avila
2017-05-12 6:27 ` Junio C Hamano
2017-05-12 13:03 ` [PATCH v4 1/3] usability: don't ask questions if no reply is required Jean-Noel Avila
2017-05-12 13:03 ` [PATCH v4 2/3] read-tree -m: make error message for merging 0 trees less smart aleck Jean-Noel Avila
2017-05-12 13:03 ` [PATCH v4 3/3] git-filter-branch: be more direct in an error message Jean-Noel Avila
2017-05-12 22:36 ` [PATCH v4 1/3] usability: don't ask questions if no reply is required Junio C Hamano
2017-05-13 15:37 ` Johannes Sixt
2017-05-15 2:18 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwp9oau9x.fsf_-_@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).