user/sven/git.git/Makefile, branch v1.6.4.5

Merge branch 'maint'

2009-07-24T16:27:09Z

* maint: SunOS grep does not understand -C nor -e Fix export_marks() error handling. git branch: clean up detached branch handling git branch: avoid unnecessary object lookups git branch: fix performance problem do_one_ref(): null_sha1 check is not about broken ref Conflicts: Makefile

SunOS grep does not understand -C nor -e

2009-07-24T16:20:34Z

The first "grep -C1" test in t7002 does not pass on my SunOS-5.11-i86pc, and that is not because our way to spawn external grep is broken, but because the native grep does not understand -C. It turns out that Peff was also using this option himself because our Makefile doesn't do that automatically. Brandon Casey uses SUNWspro compiler without having to set this, and it turns out that the compiler does not define preprocessor macro __unix__ which made him always use the built-in grep, never an external one. Let's be more explicit and say that we do not use external grep on Suns. Signed-off-by: Junio C Hamano

Makefile: update IRIX64 section

2009-07-11T06:50:29Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Makefile: add section for SGI IRIX 6.5

2009-07-11T06:50:29Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments

2009-07-11T06:50:29Z

Commit 003b33a8 recently added a call to basename(). On IRIX 6.5, this function resides in libgen and -lgen is required for the linker. Update configure.ac too. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Makefile: keep "git" when bindir is execdir

2009-07-11T03:17:33Z

For some reason there still are people who use the old style layout to put everything in $(bindir). The previous commit breaks the install for them, because it tries to unconditionally remove git from execdir and cp/ln from bindir --- oops. Signed-off-by: Junio C Hamano

Makefile: install 'git' in execdir

2009-07-09T08:19:51Z

When a git command executes a subcommand, it uses the "git foo" form, which relies on finding "git" in the PATH. Normally this should not be a problem, since the same "git" that was used to invoke git in the first place will be found. And if somebody invokes a "git" outside of the PATH (e.g., by giving its absolute path), this case is already covered: we put that absolute path onto the front of PATH. However, if one is using "sudo", then sudo will execute the "git" from the PATH, but pass along a restricted PATH that may not contain the original "git" directory. In this case, executing a subcommand will fail. To solve this, we put the "git" wrapper itself into the execdir; this directory is prepended to the PATH when git starts, so the wrapper will always be found. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/use-our-regexp'

2009-07-06T16:38:08Z

* jk/use-our-regexp: Makefile: Solaris needs HAVE_ALLOCA_H for alloca() Makefile: use compat regex on Solaris Makefile: refactor regex compat support

Merge branch 'maint'

2009-06-30T23:12:35Z

* maint: attr: plug minor memory leak request-pull: really disable pager Makes some cleanup/review in gittutorial Makefile: git.o depends on library headers git-submodule documentation: fix foreach example

Makefile: git.o depends on library headers

2009-06-30T18:17:54Z

This dependency was not yet specified anywhere else. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano