* Whitepace parameter for git restore
@ 2022-12-14 13:36 Niklas Volcz
2022-12-14 23:39 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Niklas Volcz @ 2022-12-14 13:36 UTC (permalink / raw)
To: git
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?
Best regards,
Niklas
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Whitepace parameter for git restore
2022-12-14 13:36 Whitepace parameter for git restore Niklas Volcz
@ 2022-12-14 23:39 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-12-14 23:39 UTC (permalink / raw)
To: Niklas Volcz; +Cc: git
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 ...
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-14 23:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-14 13:36 Whitepace parameter for git restore Niklas Volcz
2022-12-14 23:39 ` Junio C Hamano
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).