From: Niklas Volcz <niklas.volcz@gmail.com>
To: git@vger.kernel.org
Subject: Whitepace parameter for git restore
Date: Wed, 14 Dec 2022 14:36:11 +0100 [thread overview]
Message-ID: <CAGWBhH7ZiU_tJGj_UAB29v9Eq6C2Q-1_0YxLLN16LaEOcuV1Xw@mail.gmail.com> (raw)
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
next reply other threads:[~2022-12-14 13:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 13:36 Niklas Volcz [this message]
2022-12-14 23:39 ` Whitepace parameter for git restore 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
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=CAGWBhH7ZiU_tJGj_UAB29v9Eq6C2Q-1_0YxLLN16LaEOcuV1Xw@mail.gmail.com \
--to=niklas.volcz@gmail.com \
--cc=git@vger.kernel.org \
/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).