all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: martin rudalics <rudalics@gmx.at>
To: "Alfred M. Szmidt" <ams@gnu.org>
Cc: schwab@linux-m68k.org, emacs-devel@gnu.org
Subject: Re: tabs, git diff and git apply
Date: Sun, 29 Nov 2020 10:52:57 +0100	[thread overview]
Message-ID: <e62f24a3-7ab5-cd73-b1e1-a44d7894cbc5@gmx.at> (raw)
In-Reply-To: <E1kjIle-0007Dn-9O@fencepost.gnu.org>

 >      > If you do that again, do you get the same type of diff?
 >
 >     I get the same result.
 >
 >      > Does `git
 >      > diff` have a configuration that is doing context diffs?
 >
 >     Sure.  You just have to be able to understand the doc.
 >
 > That is easy to verify, and you should be able to do
 >
 >     HOME=/tmp git diff
 >
 > and see if the behaviour still is the same (if it doesn't work, just
 > running as a different user should).  If it isn't, it is a
 > configuraiton setting that you have done -- reading the git-config man
 > page would be the next action to see where such a setting is set.

But that wasn't my problem.  My problem was that I changed a file but
did not commit the change.  So git diff picked up the pre-change file
contents and used them instead of the actual file contents.  When I
looked at the diff output I was stumped by the fact that it claimed the
presence of a SPC character I couldn't find in that file.  The rule is
to always run git status before git diff but I probably had forgotten it
this time.

martin



  reply	other threads:[~2020-11-29  9:52 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 [this message]
2020-11-29  9:56                   ` Yuri Khan
2020-11-28 14:40 ` Stefan Monnier
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=e62f24a3-7ab5-cd73-b1e1-a44d7894cbc5@gmx.at \
    --to=rudalics@gmx.at \
    --cc=ams@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=schwab@linux-m68k.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 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.