From: Noam Postavsky <npostavs@users.sourceforge.net>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 29197@debbugs.gnu.org
Subject: bug#29197: 27.0.50; pre-commit checks for new files against "head"
Date: Tue, 7 Nov 2017 16:36:37 -0500 [thread overview]
Message-ID: <CAM-tV-_uJW6+0u6=QkFx5iDhTbSzHNABAdw2VbsMT6SLmK6okQ@mail.gmail.com> (raw)
In-Reply-To: <jwvr2t9hp7p.fsf@iro.umontreal.ca>
On Tue, Nov 7, 2017 at 2:18 PM, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> I finally figured out why recently, every time I merge changes from
> master into my local branch it complains:
>
> File name does not consist of -+./_ or ASCII letters or digits.
>
> It turns out it's because it's looking at the diff between master and my
> local (merged) branch (i.e. it looks at my local changes) whereas before
> it would look at the diff between the old version of my local branch and
> the merged version of my local branch (i.e. at the changes I'm pulling
> from master).
See [1] and followups. Getting warnings about other people's changes
was causing some confusion and frustration.
[1]: https://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00299.html
> And yes, indeed, my local branch has some files with "weird" chars
> in it.
>
> I think the warning should be improved:
> - I shouldn't get a warning in the above case, since this commit doesn't
> *add* those files (they weren't on origin/master admittedly but they were
> already on HEAD).
We could choose which side of the merge to check based on an
environment var (that was considered in the thread I referenced above,
but we didn't see much of a use case at the time). Or is it possible
to check only changes from the merge itself (i.e., in case of conflict
resolution)?
> - the warning should give me some hint about which file fails the test.
Yeah, that would make sense.
next prev parent reply other threads:[~2017-11-07 21:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 19:18 bug#29197: 27.0.50; pre-commit checks for new files against "head" Stefan Monnier
2017-11-07 21:36 ` Noam Postavsky [this message]
2018-02-15 1:03 ` Noam Postavsky
2018-08-28 12:21 ` Noam Postavsky
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAM-tV-_uJW6+0u6=QkFx5iDhTbSzHNABAdw2VbsMT6SLmK6okQ@mail.gmail.com' \
--to=npostavs@users.sourceforge.net \
--cc=29197@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/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://git.savannah.gnu.org/cgit/emacs.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).