Hello, I'm new in the list and just trying to get into freeradius. I tried to clone the repository and found this: $ git clone git://git.freeradius.org/freeradius-server.git Cloning into 'freeradius-server'... remote: Counting objects: 81887, done. remote: Compressing objects: 100% (17052/17052), done. remote: Total 81887 (delta 64675), reused 81796 (delta 64618) Receiving objects: 100% (81887/81887), 13.14 MiB | 463 KiB/s, done. Resolving deltas: 100% (64675/64675), done. $ cd freeradius-server $ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: dialup_admin/htdocs/help/filter_id_help.html # modified: dialup_admin/htdocs/help/framed_protocol_help.html # modified: dialup_admin/htdocs/help/service_type_help.html # modified: raddb/sql/oracle/msqlippool.txt # modified: share/dictionary.freeswitch # modified: src/modules/rlm_ruby/rlm_ruby.c # modified: src/modules/rlm_securid/Makefile # modified: src/modules/rlm_securid/rlm_securid.c # no changes added to commit (use "git add" and/or "git commit -a")
From man gitattributes:
ident When the attribute ident is set for a path, git replaces $Id$ in the blob object with $Id:, followed by the 40-character hexadecimal blob object name, followed by a dollar sign $ upon checkout. Any byte sequence that begins with $Id: and ends with $ in the worktree file is replaced with $Id$ upon check-in And at the end of git diff, there are multiple changes similar to: - * Version: $Id: $ + * Version: $Id$ Sorry if this was already reported.
Manuel Argüelles wrote:
From man gitattributes:
ident When the attribute ident is set for a path, git replaces $Id$ in the blob object with $Id:, followed by the 40-character hexadecimal blob object name, followed by a dollar sign $ upon checkout. Any byte sequence that begins with $Id: and ends with $ in the worktree file is replaced with $Id$ upon check-in
And at the end of git diff, there are multiple changes similar to:
- * Version: $Id: $ + * Version: $Id$
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file. Alan DeKok.
On Thu, Nov 01, 2012 at 04:35:45PM +0100, Alan DeKok wrote:
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file.
Probably it is set by default (git version 1.8.0): $ cat ~/.gitconfig [user] name = Manuel Argüelles [core] editor = emacs -nw
Manuel Argüelles wrote:
On Thu, Nov 01, 2012 at 04:35:45PM +0100, Alan DeKok wrote:
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file.
Probably it is set by default (git version 1.8.0):
Hmm... that's new. Alan DeKok.
On 1 Nov 2012, at 15:55, Alan DeKok <aland@deployingradius.com> wrote:
Manuel Argüelles wrote:
On Thu, Nov 01, 2012 at 04:35:45PM +0100, Alan DeKok wrote:
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file.
Probably it is set by default (git version 1.8.0):
Hmm... that's new.
It is set in the repo as of a couple of hours ago. I think i've fixed up all the problematic ones so it should be ok now. -Arran
On 01/11/12 16:04, Arran Cudbard-Bell wrote:
On 1 Nov 2012, at 15:55, Alan DeKok <aland@deployingradius.com> wrote:
Manuel Argüelles wrote:
On Thu, Nov 01, 2012 at 04:35:45PM +0100, Alan DeKok wrote:
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file.
Probably it is set by default (git version 1.8.0):
Hmm... that's new.
It is set in the repo as of a couple of hours ago. I think i've fixed up all the problematic ones so it should be ok now.
For reference this, and the "text=auto", are causing me problems on v2.x.x branches: - share/dictionary.freeswitch - reporting a change for $Id$ - raddb/sql/oracle/msqlippool.txt - line endings I don't think I can fix these locally, can I?
On 14/11/12 15:25, Phil Mayers wrote:
On 01/11/12 16:04, Arran Cudbard-Bell wrote:
On 1 Nov 2012, at 15:55, Alan DeKok <aland@deployingradius.com> wrote:
Manuel Argüelles wrote:
On Thu, Nov 01, 2012 at 04:35:45PM +0100, Alan DeKok wrote:
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file.
Probably it is set by default (git version 1.8.0):
Hmm... that's new.
It is set in the repo as of a couple of hours ago. I think i've fixed up all the problematic ones so it should be ok now.
For reference this, and the "text=auto", are causing me problems on v2.x.x branches:
- share/dictionary.freeswitch - reporting a change for $Id$ - raddb/sql/oracle/msqlippool.txt - line endings
I don't think I can fix these locally, can I?
"man gitattributes" suggests this procedure: $ echo "* text=auto" >>.gitattributes $ rm .git/index # Remove the index to force git to $ git reset # re-scan the working directory $ git status # Show files that will be normalized ...which shows problems with: dialup_admin/htdocs/help/filter_id_help.html dialup_admin/htdocs/help/framed_protocol_help.html dialup_admin/htdocs/help/service_type_help.html raddb/sql/oracle/msqlippool.txt share/dictionary.freeswitch ...in v2.x.x branches, at least. I was able to "fix" this broken repo with: git rm .gitattributes git checkout <thefiles> git stash save grumble-grumble ...so I can at least "git checkout" now.
On 14 Nov 2012, at 15:40, Phil Mayers <p.mayers@imperial.ac.uk> wrote:
On 14/11/12 15:25, Phil Mayers wrote:
On 01/11/12 16:04, Arran Cudbard-Bell wrote:
On 1 Nov 2012, at 15:55, Alan DeKok <aland@deployingradius.com> wrote:
Manuel Argüelles wrote:
On Thu, Nov 01, 2012 at 04:35:45PM +0100, Alan DeKok wrote:
Well, don't set "ident". It's not set in the FreeRADIUS repository, so t must be set in your local ~/.gitconfig file.
Probably it is set by default (git version 1.8.0):
Hmm... that's new.
It is set in the repo as of a couple of hours ago. I think i've fixed up all the problematic ones so it should be ok now.
For reference this, and the "text=auto", are causing me problems on v2.x.x branches:
- share/dictionary.freeswitch - reporting a change for $Id$ - raddb/sql/oracle/msqlippool.txt - line endings
I don't think I can fix these locally, can I?
"man gitattributes" suggests this procedure:
$ echo "* text=auto" >>.gitattributes $ rm .git/index # Remove the index to force git to $ git reset # re-scan the working directory $ git status # Show files that will be normalized
...which shows problems with:
dialup_admin/htdocs/help/filter_id_help.html dialup_admin/htdocs/help/framed_protocol_help.html dialup_admin/htdocs/help/service_type_help.html raddb/sql/oracle/msqlippool.txt share/dictionary.freeswitch
...in v2.x.x branches, at least.
I was able to "fix" this broken repo with:
git rm .gitattributes git checkout <thefiles> git stash save grumble-grumble
Ok cherry-picked 8f90e2174e15790b2b26a45bc2997b126317b67d over to v2.x.x branch. -Arran
On 14/11/12 16:27, Arran Cudbard-Bell wrote:
Ok cherry-picked 8f90e2174e15790b2b26a45bc2997b126317b67d over to v2.x.x branch.
Cool. A bit of dancing around with stash/reset and I've got a repo I can actually "git checkout" in again ;o) Git really does contain a sufficiency of rope to hang... well, pretty much everyone!
On 14 Nov 2012, at 16:44, Phil Mayers <p.mayers@imperial.ac.uk> wrote:
On 14/11/12 16:27, Arran Cudbard-Bell wrote:
Ok cherry-picked 8f90e2174e15790b2b26a45bc2997b126317b67d over to v2.x.x branch.
Cool. A bit of dancing around with stash/reset and I've got a repo I can actually "git checkout" in again ;o)
Git really does contain a sufficiency of rope to hang... well, pretty much everyone!
Yes. What's weird is I actually removed the contents of my working directory and did a git reset --hard HEAD to make sure everything was fresh, right after I did that commit, and these line ending issues didn't show up, I have no idea why. Apologies for the issues. Hopefully it'll all be sorted now. -Arran
On Wed, Nov 14, 2012 at 03:40:18PM +0000, Phil Mayers wrote:
I don't think I can fix these locally, can I?
Had the same in master the other day - Alan merged the pull request that fixed it there. Was just a checkout, add, commit, to fixup the line endings (with the unfortunate side effect that it means 'blame' now says those files are all my fault...!) Cheers Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Architect (UNIX and Networks), Network Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
participants (5)
-
Alan DeKok -
Arran Cudbard-Bell -
Manuel Argüelles -
Matthew Newton -
Phil Mayers