git/attr.c, branch v1.6.3

Fix a bunch of pointer declarations (codestyle)

2009-05-01T22:17:31Z

Essentially; s/type* /type */ as per the coding guidelines. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

attr: add GIT_ATTR_INDEX "direction"

2009-04-18T04:05:49Z

This instructs attr mechanism, not to look into working .gitattributes at all. Needed by tools that does not handle working directory, such as "git archive". Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Read attributes from the index that is being checked out

2009-03-14T05:51:43Z

Traditionally we used .gitattributes file from the work tree if exists, and otherwise read from the index as a fallback. When switching to a branch that has an updated .gitattributes file, and entries in it give different attributes to other paths being checked out, we should instead read from the .gitattributes in the index. This breaks a use case of fixing incorrect entries in the .gitattributes in the work tree (without adding it to the index) and checking other paths out, though. $ edit .gitattributes ;# mark foo.dat as binary $ rm foo.dat $ git checkout foo.dat Signed-off-by: Junio C Hamano

Fix buffer overflow in prepare_attr_stack

2008-07-16T21:05:50Z

If PATH_MAX on your system is smaller than a path stored in the git repo, it may cause the buffer overflow in prepare_attr_stack. Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

Ignore .gitattributes in bare repositories

2008-06-09T22:08:26Z

Attributes can be specified at three different places: the internal table of default values, the file $GIT_DIR/info/attributes and files named .gitattributes in the work tree. Since bare repositories don't have a work tree, git should ignore any .gitattributes files there. This patch makes git do that, so the only way left for a user to specify attributes in a bare repository is the file info/attributes (in addition to changing the defaults and recompiling). In addition, git-check-attr is now allowed to run without a work tree. Like any user of the code in attr.c, it ignores the .gitattributes files when run in a bare repository. It can still read from info/attributes. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

gitattributes: Fix subdirectory attributes specified from root directory

2008-04-23T04:12:37Z

Signed-off-by: Matthew Ogilvie Signed-off-by: Junio C Hamano

gitattributes: fix relative path matching

2008-02-07T08:04:50Z

There was an embarrassing pair of off-by-one miscounting that failed to match path "a/b/c" when "a/.gitattributes" tried to name it with relative path "b/c". This fixes it. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-10-19T05:18:55Z

* maint: Further 1.5.3.5 fixes described in release notes Avoid invoking diff drivers during git-stash attr: fix segfault in gitattributes parsing code Define NI_MAXSERV if not defined by operating system Ensure we add directories in the correct order Avoid scary errors about tagged trees/blobs during git-fetch

attr: fix segfault in gitattributes parsing code

2007-10-19T01:11:27Z

git may segfault if gitattributes contains an invalid entry. A test is added to t0020 that triggers the segfault. The parsing code is fixed to avoid the crash. Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce

Use xmemdupz() in many places.

2007-09-19T00:42:17Z

Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano