From: Stefan Monnier <monnier@iro.umontreal.ca>
To: martin rudalics <rudalics@gmx.at>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: tabs, git diff and git apply
Date: Sat, 28 Nov 2020 09:40:47 -0500 [thread overview]
Message-ID: <jwv360t5z07.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <582708de-231a-1792-da69-844faefeaa4c@gmx.at> (martin rudalics's message of "Sat, 28 Nov 2020 10:29:51 +0100")
> Some three lines appearing in my window.c as
>
> if (WINDOWP (w->contents))
> cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data);
> else
>
> appear in *shell* after git diff as
>
> + if (WINDOWP (w->contents))
> + cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data);
> + else
>
> Note the extra space after the "+" in the second line and the off-by-one
> indentation.
Any chance you're using non-unified diffs? These match the
"[-+ ] <LINE>" pattern, contrary to unified diffs which use "[-+ ]<LINE>".
IOW, maybe there's nothing wrong.
> A subsequent git apply then complains about
>
> /home/martin/temp/master..changes-2020-11-28.diff:3847: space before tab in indent.
> cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data);
Hard to tell without more info.
Have you tried it in an xterm rather than withing a *shell* buffer?
Stefan
next prev parent reply other threads:[~2020-11-28 14:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-28 9:29 tabs, git diff and git apply martin rudalics
2020-11-28 9:39 ` Andreas Schwab
2020-11-28 10:15 ` martin rudalics
2020-11-28 10:23 ` Andreas Schwab
2020-11-28 10:28 ` martin rudalics
2020-11-28 12:08 ` Andreas Schwab
2020-11-28 12:45 ` martin rudalics
2020-11-28 13:34 ` Andreas Schwab
2020-11-28 14:20 ` martin rudalics
2020-11-28 17:27 ` Alfred M. Szmidt
2020-11-28 18:23 ` martin rudalics
2020-11-28 18:52 ` Alfred M. Szmidt
2020-11-29 8:21 ` martin rudalics
2020-11-29 9:13 ` Alfred M. Szmidt
2020-11-29 9:52 ` martin rudalics
2020-11-29 9:56 ` Yuri Khan
2020-11-28 14:40 ` Stefan Monnier [this message]
2020-11-28 15:45 ` martin rudalics
2020-11-28 16:47 ` Stefan Monnier
2020-11-28 18:22 ` martin rudalics
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=jwv360t5z07.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=rudalics@gmx.at \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.