Junio C Hamano wrote:
Mark Levedahl <mlevedahl@xxxxxxxxxxx> writes:
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.
Unless you are doing something other than what you demonstrated
above, I think what 'diff' and 'commit' steps show is expected,
even without autoCRLF. 'git status' might be buggy.
I forgot the vital "-a" argument to git commit above. Adding -a gets the
desired behavior (the difference disappears). Here is a sequence that
is clearly counter-intuitive:
create foo with CRLF endings, then ...
$ git config core.autocrlf input
$ git add foo
$ git commit -m x foo
Created commit a9e9d4e1b88087462a4e15ff9044fa31e16d11bc
1 files changed, 935 insertions(+), 0 deletions(-)
create mode 100644 foo
$ git diff
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 add foo
$ git status
# On branch master
nothing to commit (working directory clean)
--- git should not show a just checked in file as being different.
Note: a simple "git add foo" clears the above up, as would
git-update-index foo
Also, if I invoke git-gui on the above repository showing foo as modified...
1) foo shows up in the "Changed But Not Updated" list.
2) Clicking on foo gives message box with "No differences detected. ...
Clicking the "ok" button invokes a rescan, back to step 1.
3) Adding foo to the commit list in git-gui works.
4) Committing the above from git-gui gives a commit with no
changes (commit is made, shows up in git log, but has no
changes associated).
--- I don't think git-gui should make create an empty commit in the
above case.
Mark
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html