From: Stefan Beller <stefanbeller@googlemail.com>
To: git@vger.kernel.org, jrnieder@gmail.com, trast@student.ethz.ch,
gitster@pobox.com
Cc: Stefan Beller <stefanbeller@googlemail.com>
Subject: [PATCH 0/2] git diff -q option removal
Date: Tue, 16 Jul 2013 12:28:05 +0200 [thread overview]
Message-ID: <1373970487-32595-1-git-send-email-stefanbeller@googlemail.com> (raw)
In-Reply-To: <20130714220739.GC13444@google.com>
On 07/15/2013 12:07 AM, Jonathan Nieder wrote:
> This feature was obviously never tested with --no-index, so I agree it
> makes sense to remove it. Probably the commit message and a comment
> should say so, though. E.g.:
>
> diff --no-index: remove nonfunctional "-q" handling
>
> Before v1.5.6-rc1~41^2~2, the option parsing for diff --no-index
> and "git diff-files" shared code. In "git diff-files", "-q" means
> to be silent about removed files. In "git diff --no-index", in
> various versions it has been an error, an infinite loop, or a no-op.
>
> Simplify the code to clarify that it is now a no-op, continuing to
> accept and ignore the -q option in "git diff --no-index" to avoid
> breaking scripts.
>
> I wouldn't mind removing support for "-q" altogether, by the way (as a
> separate change).
>
> Hope that helps,
> Jonathan
>
I am resending the commit with a different wording, thanks to Jonathan.
However I tried to remove support for -q in a separate commit, and
I have some questions about the structure of the files.
(I am sure it's documented, but I cannot find it, so please hint me
where to read.)
The changes in the following patch are in diff_no_index.c, but the
diff_no_index(...) is called from cmd_diff, which is in builtin/diff.c
That cmd_diff is actually called from git.c having the
{ "diff", cmd_diff }, entry in handle_internal_command.
My question now is this: Why is the builtin/diff.c relying on stuff
outside of builtin/ ? Wouldn't it be better to move all these files
(such as diff_no_index.c) into the builtin folder as well?
Regarding the removal of the -q option, I tried it in the second patch.
Is it as easy as that, or am I missing the point?
The first patch doesn't change the behavior, so I'd assume it's safe to
apply it to origin/sb/misc-fixes, whereas the second patch will make
git diff complain about the -q option, so I'd assume it would wait for the
next major release?
Before:
touch actual_file
git diff -q actual_file no_file
error: Could not access 'no_file'
echo $?
1
After:
touch actual_file
git diff -q actual_file no_file
fatal: invalid diff option/value: -q
echo $?
128
Thanks,
Stefan
Stefan Beller (2):
diff --no-index: remove nonfunctional "-q" handling
git diff: Remove -q option to stay silent on missing files.
Documentation/git-diff-files.txt | 6 +-----
diff-no-index.c | 5 -----
2 files changed, 1 insertion(+), 10 deletions(-)
--
1.8.2.3.10.g2733812
next prev parent reply other threads:[~2013-07-16 10:28 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-14 21:35 [PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer Stefan Beller
2013-07-14 21:35 ` [PATCH 2/4] commit: Fix a memory leak in determine_author_info Stefan Beller
2013-07-14 21:49 ` Jonathan Nieder
2013-07-14 21:35 ` [PATCH 3/4] diff-no-index: Remove unused variable Stefan Beller
2013-07-14 22:07 ` Jonathan Nieder
2013-07-16 10:28 ` Stefan Beller [this message]
2013-07-16 10:28 ` [PATCH 1/2] diff --no-index: remove nonfunctional "-q" handling Stefan Beller
2013-07-16 10:28 ` [PATCH 2/2] diff: Remove -q to stay silent on missing files Stefan Beller
2013-07-17 17:04 ` [PATCH 0/2] git diff -q option removal Junio C Hamano
2013-07-17 18:06 ` Junio C Hamano
2013-07-17 20:05 ` Stefan Beller
2013-07-18 0:30 ` [PATCH 0/6] Deprecating "diff-files -q" Junio C Hamano
2013-07-18 0:30 ` [PATCH 1/6] diff: pass the whole diff_options to diffcore_apply_filter() Junio C Hamano
2013-07-18 0:30 ` [PATCH 2/6] diff: factor out match_filter() Junio C Hamano
2013-07-18 0:30 ` [PATCH 3/6] diff: preparse --diff-filter string argument Junio C Hamano
2013-07-18 0:30 ` [PATCH 4/6] diff: reject unknown change class given to --diff-filter Junio C Hamano
2013-07-18 0:30 ` [PATCH 5/6] diff: allow lowercase letter to specify what change class to exclude Junio C Hamano
2013-07-18 0:30 ` [PATCH 6/6] diff: deprecate -q option to diff-files Junio C Hamano
2013-07-19 3:20 ` [PATCH 7/6] diff: remove "diff-files -q" at Git 2.0 version boundary Junio C Hamano
2013-07-19 3:31 ` [PATCH 6/6] diff: deprecate -q option to diff-files Jonathan Nieder
2013-07-19 7:24 ` Junio C Hamano
2013-07-19 21:01 ` Jonathan Nieder
2013-07-14 21:35 ` [PATCH 4/4] diff.c: Do not initialize a variable, which gets reassigned anyway Stefan Beller
2013-07-14 22:18 ` Jonathan Nieder
2013-07-14 21:48 ` [PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer Jonathan Nieder
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=1373970487-32595-1-git-send-email-stefanbeller@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=trast@student.ethz.ch \
/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).