Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@univ-lyon1.fr>,
	Felipe Contreras <felipe.contreras@gmail.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Can we clarify the purpose of `git diff -s`?
Date: Fri, 12 May 2023 12:21:24 -0700	[thread overview]
Message-ID: <xmqqv8gxpd8r.fsf@gitster.g> (raw)
In-Reply-To: <87h6shif6q.fsf@osv.gnss.ru> (Sergey Organov's message of "Fri, 12 May 2023 21:21:17 +0300")

Sergey Organov <sorganov@gmail.com> writes:

> --patch. Thus, making --no-patch a synonym for -s was a mistake in the
> first place that leaked through review process at that time, and
>
>    git show --format="%ad" --no-patch
>
> will still work the same way even if we fix --no-patch to disable
> --patch only.

Not so fast.  I have a show.outputFormat configuration variable to
teach builtin/log.c::show_setup_revisions_tweak() to tweak the
hardcoded default from DIFF_FORMAT_PATCH to others (primarily
because I often find myself doing "git show -p --stat").  Changing
"--no-patch" to toggle only "--patch" away will close the door for
future improvement like that, and "will still work" is an illusion.

The user needs to be told that "--no-patch" no longer means "-s" and
somebody needs to apologize to them that we are deliberately
breaking their reliance they held for 10 years, based on what we
documented and prepare a smooth transition for them.  Until the time
when nobody uses "--no-patch" as a synonym for "-s" any longer, such
a future improvement would be blocked.  And that is another reason
why I want to be much more careful about "should --no-patch be
changed to mean something other than -s" than "should -s be fixed
not to be sticky for some but not all options".  The latter is not a
documented "feature" and it clearly was a bug that "-s --raw" did not
honor "--raw".  The former was a documented "feature", even though
it may have been a suboptimal one.

  reply	other threads:[~2023-05-12 19:21 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-11  3:14 Can we clarify the purpose of `git diff -s`? Felipe Contreras
2023-05-11 11:59 ` Sergey Organov
2023-05-11 16:26   ` Junio C Hamano
2023-05-11 17:37   ` Junio C Hamano
2023-05-11 18:04     ` Sergey Organov
2023-05-11 18:27       ` Junio C Hamano
2023-05-11 18:36       ` Felipe Contreras
2023-05-11 18:17     ` Felipe Contreras
2023-05-11 17:41   ` Felipe Contreras
2023-05-11 18:31     ` Sergey Organov
2023-05-11 19:10       ` Felipe Contreras
2023-05-11 19:32         ` Sergey Organov
2023-05-11 19:54           ` Felipe Contreras
2023-05-11 20:24             ` Sergey Organov
2023-05-11 20:59               ` Felipe Contreras
2023-05-11 22:49                 ` Sergey Organov
2023-05-11 23:28                   ` Felipe Contreras
2023-05-12  8:40                     ` Sergey Organov
2023-05-12 19:19                       ` Felipe Contreras
     [not found]   ` <5bb24e0208dd4a8ca5f6697d578f3ae0@SAMBXP02.univ-lyon1.fr>
2023-05-12  8:15     ` Matthieu Moy
2023-05-12 17:03       ` Junio C Hamano
2023-05-12 18:21         ` Sergey Organov
2023-05-12 19:21           ` Junio C Hamano [this message]
2023-05-12 19:34             ` Junio C Hamano
2023-05-12 20:28             ` Felipe Contreras
2023-05-12 20:47               ` Junio C Hamano
2023-05-12 21:01                 ` Felipe Contreras
2023-05-12 21:47                   ` Junio C Hamano
2023-05-12 21:48                     ` Junio C Hamano
2023-05-12 23:21                     ` Felipe Contreras
2023-05-12 21:41                 ` Sergey Organov
2023-05-12 22:17                   ` Junio C Hamano
2023-05-12 22:47                     ` Sergey Organov
2023-05-12 23:07                   ` Felipe Contreras
2023-05-13 14:58                     ` Philip Oakley
2023-05-13 17:45                       ` Sergey Organov
2023-05-12 19:47           ` Felipe Contreras
2023-05-12 19:34         ` Felipe Contreras
2023-05-12 19:17       ` Felipe Contreras

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=xmqqv8gxpd8r.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=Matthieu.Moy@univ-lyon1.fr \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sorganov@gmail.com \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).