git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Usman Akinyemi via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Usman Akinyemi <usmanakinyemi202@gmail.com>
Subject: Re: [PATCH] diff: update conflict handling for whitespace to issue a warning
Date: Tue, 12 Nov 2024 08:59:50 +0900	[thread overview]
Message-ID: <xmqqfrnx9v9l.fsf@gitster.g> (raw)
In-Reply-To: <pull.1828.git.git.1731347396097.gitgitgadget@gmail.com> (Usman Akinyemi via GitGitGadget's message of "Mon, 11 Nov 2024 17:49:55 +0000")

"Usman Akinyemi via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Usman Akinyemi <usmanakinyemi202@gmail.com>
>
> Modify the conflict resolution between tab-in-indent and
> indent-with-non-tab to issue a warning instead of terminating
> the operation with `die()`. Update the `git diff --check` test to
> capture and verify the warning message output.

Hmph, giving a warning against these conflicting setting (instead of
dying) and continuing _may_ make sense sometimes, but it is unclear
which one should survive.

I do not think of a scenario in which it makes much sense to let the
program warn only on one but not the other one.  Perhaps disabling
both, if we were to do the "warn and keep going, instead of dying",
may make some more sense than that.  I dunno.



  reply	other threads:[~2024-11-11 23:59 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-11 17:49 [PATCH] diff: update conflict handling for whitespace to issue a warning Usman Akinyemi via GitGitGadget
2024-11-11 23:59 ` Junio C Hamano [this message]
2024-11-13 19:01 ` [PATCH v2] " Usman Akinyemi via GitGitGadget
2024-11-14  2:15   ` Junio C Hamano
2024-11-14 10:06     ` Phillip Wood
2024-11-14 11:29       ` Usman Akinyemi
2024-11-15  0:11       ` Junio C Hamano
2024-11-18 21:03         ` Usman Akinyemi
2024-11-19  0:36           ` Junio C Hamano
2024-11-19 16:49         ` Phillip Wood
2024-11-20  1:23           ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqfrnx9v9l.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=usmanakinyemi202@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 NNTP newsgroup(s).