git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Levedahl <mlevedahl@verizon.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: autoCRLF, git status, git-gui, what is the desired behavior?
Date: Sun, 25 Feb 2007 14:33:16 -0500	[thread overview]
Message-ID: <45E1E47C.5090908@verizon.net> (raw)

I am trying autoCRLF in git compiled from next (75415c455dd307), find 
some behavior that is probably different than desired dealing with a 
file where the only changes are to line endings:

create a text file (foo) with \n endings, check it in.
$ u2d foo
$ git diff foo
diff --git a/foo b/foo
$ git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#       modified:   foo
#
$ git ci -m 'x' foo
# On branch master
nothing to commit (working directory clean)

So, git commit will not check in the file, but git status shows an 
unclean file and git diff shows no actual differences.

Also, git-gui shows the file as modified, but clicking on that file 
gives a warning box saying "No differences detected...", does a rescan, 
and then shows the file as modified again.

I'm not sure of the correct fix:
1) Place the file in a separate category, perhaps "broken line-endings", 
and indicate that git will not check this in?
2) Overwrite the file with a fresh checkout (erasing the crlf differences)?
3) ?

Mark Levedahl

             reply	other threads:[~2007-02-25 19:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-25 19:33 Mark Levedahl [this message]
2007-02-25 19:54 ` autoCRLF, git status, git-gui, what is the desired behavior? Junio C Hamano
2007-02-25 20:28   ` Junio C Hamano
2007-02-25 21:14     ` Mark Levedahl
2007-02-25 21:22       ` Junio C Hamano
2007-02-25 22:20         ` Mark Levedahl
2007-02-25 23:55           ` Mark Levedahl
2007-02-25 20:51   ` Mark Levedahl
2007-02-26  2:06     ` Shawn O. Pearce
2007-02-26  2:45       ` Junio C Hamano
2007-02-26 15:54         ` Shawn O. Pearce

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=45E1E47C.5090908@verizon.net \
    --to=mlevedahl@verizon.net \
    --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.
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 NNTP newsgroup(s).