From: Junio C Hamano <gitster@pobox.com>
To: Niklas Volcz <niklas.volcz@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Whitepace parameter for git restore
Date: Thu, 15 Dec 2022 08:39:41 +0900 [thread overview]
Message-ID: <xmqqmt7pv9ky.fsf@gitster.g> (raw)
In-Reply-To: <CAGWBhH7ZiU_tJGj_UAB29v9Eq6C2Q-1_0YxLLN16LaEOcuV1Xw@mail.gmail.com> (Niklas Volcz's message of "Wed, 14 Dec 2022 14:36:11 +0100")
Niklas Volcz <niklas.volcz@gmail.com> writes:
> Is there a way to pass apply.whitespace when using "git restore" like
> how it is done for git apply? I believe this might be a bug/missing
> feature.
> I have apply.whitespace=fix in my user git config. This usually works
> fine but I was working on a patch for a project today which is using
> tabs and spaces which messed up the commit. In order to avoid
> cluttering the diff with whitespace changes I tried to remove the
> whitespace changes with "git restore -p
> src/the-file-with-tabs-and-spaces.sh" but it seems that this causes
> git to fix the whitespaces again due to the configuration. I worked
> around this by setting a repo local config with
> "apply.whitespace=warn" but I wonder if there shouldn't be an
> --whitespace flag for git restore like it is for git apply. Is this a
> bug?
It is arguable what should qualify as a "bug", but "restore" or
"checkout" are primarily "grab the recorded blob out of the object
store and materialize its contents as a whole in a file in the
working tree", and there is no place for features that are about
patch application like "apply to fix whitespace" to come in. So a
command line option --whitespace=warn would not be a very good fit.
Having said that, I wonder if you can cheat by
$ git -c apply.whitespace=ignore restore -p ...
prev parent reply other threads:[~2022-12-14 23:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 13:36 Whitepace parameter for git restore Niklas Volcz
2022-12-14 23:39 ` Junio C Hamano [this message]
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=xmqqmt7pv9ky.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=niklas.volcz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.