diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-24 17:37:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-24 17:37:40 -0700 |
| commit | 5bc2dc29d482448f2bdc0e9bbcb6e2d8a89d9c6a (patch) | |
| tree | ff205041e4b12a10f2106300be7b53135264dc29 | |
| parent | bd578b507fa79f94009ae1c1a436dc14cf7e6002 (diff) | |
| parent | c4649188e9140c960cec54798b153382fb4d6191 (diff) | |
| download | git-5bc2dc29d482448f2bdc0e9bbcb6e2d8a89d9c6a.tar.gz | |
Sync with maint
By Jeff King (1) and Junio C Hamano (1)
* maint:
Update draft release notes to 1.7.10.3
osxkeychain: pull make config from top-level directory
| -rw-r--r-- | Documentation/RelNotes/1.7.10.3.txt | 6 | ||||
| -rw-r--r-- | contrib/credential/osxkeychain/Makefile | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.10.3.txt b/Documentation/RelNotes/1.7.10.3.txt index 9c9ec25946..153bf14032 100644 --- a/Documentation/RelNotes/1.7.10.3.txt +++ b/Documentation/RelNotes/1.7.10.3.txt @@ -4,6 +4,12 @@ Git v1.7.10.3 Release Notes Fixes since v1.7.10.2 --------------------- + * The message file for German translation has been updated a bit. + + * "git status --porcelain" ignored "--branch" option by mistake. The + output for "git status --branch -z" was also incorrect and did not + terminate the record for the current branch name with NUL as asked. + * Running "git checkout" on an unborn branch used to corrupt HEAD. * When checking out another commit from an already detached state, we diff --git a/contrib/credential/osxkeychain/Makefile b/contrib/credential/osxkeychain/Makefile index 75c07f8be4..4b3a08a2ba 100644 --- a/contrib/credential/osxkeychain/Makefile +++ b/contrib/credential/osxkeychain/Makefile @@ -2,10 +2,13 @@ all:: git-credential-osxkeychain CC = gcc RM = rm -f -CFLAGS = -g -Wall +CFLAGS = -g -O2 -Wall + +-include ../../../config.mak.autogen +-include ../../../config.mak git-credential-osxkeychain: git-credential-osxkeychain.o - $(CC) -o $@ $< -Wl,-framework -Wl,Security + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security git-credential-osxkeychain.o: git-credential-osxkeychain.c $(CC) -c $(CFLAGS) $< |