msysGit group: I noticed a recent change that needed amending. Specifically, commit 1282e217effd38284a3d4fdfa77abe9d860fd399 The intent is understood however the syntax was wrong.
I was going to push the change to the mob branch but I am a git novice so this warning message startled me: (double-clicked msys.bat from the directory prepared by msysGit-netinstall-1.5.4-rc0-preview20071217.exe) [EMAIL PROTECTED] / $ echo `which git`##`git --version`##`git describe` /bin/git##git version 1.5.4.GIT##Git-preview20080301-2-gdff9769 [EMAIL PROTECTED] / $ git config -l core.symlinks=false core.autocrlf=true color.diff=auto pack.packsizelimit=2g core.repositoryformatversion=0 core.filemode=false core.bare=false core.logallrefupdates=true core.symlinks=false remote.origin.url=http://repo.or.cz/r/msysgit.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* branch.master.remote=origin branch.master.merge=refs/heads/master remote.mob.url=ssh://[EMAIL PROTECTED]/srv/git/msysgit.git remote.mob.fetch=+refs/remote/mob:refs/remotes/origin/mob remote.mob.push=master:mob submodule.git.url=git://repo.or.cz/git/mingw/4msysgit.git submodule.html.url=git://repo.or.cz/git.git [EMAIL PROTECTED] / $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: share/msysGit-netinstall/setup-msysgit.sh # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # share/msysGit-netinstall/setup-msysgit.sh.~1~ no changes added to commit (use "git add" and/or "git commit -a") [EMAIL PROTECTED] / $ git diff diff --git a/share/msysGit-netinstall/setup-msysgit.sh b/share/msysGit- netinstal index 7b951d0..1fa788c 100644 --- a/share/msysGit-netinstall/setup-msysgit.sh +++ b/share/msysGit-netinstall/setup-msysgit.sh @@ -107,7 +107,7 @@ git config submodule.git.url $MINGW4MSYSGIT_REPO_URL && mkdir git && cd git && git init && -git config core.autocrlf = input && +git config core.autocrlf input && git config remote.junio.url $GIT_REPO_URL && git config remote.junio.fetch '+refs/heads/*:refs/remotes/junio/*' && git fetch junio && warning: LF will be replaced by CRLF in share/msysGit-netinstall/setup- msysgit.s Explaining the above: --system core.autocrlf true. I edited /share/ msysGit-netinstall/setup-msysgit.sh to correct the syntax error. I verify the change using git diff. The warning message "LF will be replaced by CRLF in share/msysGit-netinstall/setup-msysgit.sh" is shown. Then I check it in, forcefully delete the working copy, then reconstitute it: [EMAIL PROTECTED] / $ git add /share/msysGit-netinstall/setup-msysgit.sh warning: LF will be replaced by CRLF in share/msysGit-netinstall/setup- msysgit.sh [EMAIL PROTECTED] / $ git commit -m "Correct syntax error on core.autocrlf=input" Created commit warning: LF will be replaced by CRLF in share/msysGit- netinstall/setup-msysgit.sh 876fbb6: Correct syntax error on core.autocrlf=input 1 files changed, 1 insertions(+), 1 deletions(-) [EMAIL PROTECTED] / $ rm /share/msysGit-netinstall/setup-msysgit.sh [EMAIL PROTECTED] / $ git checkout -- /share/msysGit-netinstall/setup-msysgit.sh The file now has CRLF line endings when it previously had LF line endings. Is the above behavior correct for this repository? Is the above behavior correct in general? Assuming that the file must maintain LF line endings, is the solution to change the git attribute for this file? Actually, it doesn't seem to help, because after reconstituting the file, it still is CRLF. Perhaps the best way to fix it is to checkout the msysgit repository as core.autocrlf=false? Best regards, Clifford Caoile
