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

Makefile: Track changes to LDFLAGS and relink when necessary

2011-06-22T18:56:53Z

Some profiling tools (e.g., google-perftools and mutrace) work by linking in a new library into the executables. When using these tools it is convenient to only relink instead of doing a full make clean; make cycle. This change complements the auto-detection of changes to CFLAGS that we already have. Tracking of more variables that affect the build can be added when the need arise. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

Merge branch 'mk/grep-pcre'

2011-05-30T07:00:07Z

* mk/grep-pcre: git-grep: Fix problems with recently added tests git-grep: Update tests (mainly for -P) Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS git-grep: update tests now regexp type is "last one wins" git-grep: do not die upon -F/-P when grep.extendedRegexp is set. git-grep: Bail out when -P is used with -F or -E grep: Add basic tests configure: Check for libpcre git-grep: Learn PCRE grep: Extract compile_regexp_failed() from compile_regexp() grep: Fix a typo in a comment grep: Put calls to fixmatch() and regmatch() into patmatch() contrib/completion: --line-number to git grep Documentation: Add --line-number to git-grep synopsis

Merge branch 'jk/haves-from-alternate-odb'

2011-05-30T06:51:22Z

* jk/haves-from-alternate-odb: receive-pack: eliminate duplicate .have refs bisect: refactor sha1_array into a generic sha1 list refactor refs_from_alternate_cb to allow passing extra data

Merge branch 'rg/no-gecos-in-pwent'

2011-05-26T17:32:19Z

* rg/no-gecos-in-pwent: ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd Conflicts: Makefile

Merge branch 'ab/i18n-scripts-basic'

2011-05-23T16:58:45Z

* ab/i18n-scripts-basic: Makefile: add xgettext target for *.sh files git-sh-i18n.sh: add GIT_GETTEXT_POISON support git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

bisect: refactor sha1_array into a generic sha1 list

2011-05-20T03:02:10Z

This is a generally useful abstraction, so let's let others make use of it. The refactoring is more or less a straight copy; however, functions and struct members have had their names changed to match string_list, which is the most similar data structure. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Makefile: sort TEST_PROGRAMS list

2011-05-20T02:44:59Z

We usually keep these lists in sorted order, but the last few entries were just tacked on the end. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd

2011-05-20T01:35:58Z

Allow NO_GECOS_IN_PWENT to be defined in the Makefile for platforms that lack the pw_gecos field in their "struct passwd", in which case the uppercased user name is used instead via the standard '&' replacement mechanism. Signed-off-by: Rafael Gieschke Signed-off-by: Junio C Hamano

Merge branch 'kk/maint-prefix-in-config-mak'

2011-05-16T23:46:53Z

* kk/maint-prefix-in-config-mak: Honor $(prefix) set in config.mak* when defining ETC_GIT* Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir

Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS

2011-05-16T07:11:53Z

Otherwise we would fail to rebuild correctly when this option was changed between $(MAKE) invocations, and more importantly, $(MAKE) test would not pass it down and t/test-lib.sh would not set the LIBPCRE prerequisite. Signed-off-by: Junio C Hamano