Junio C Hamano  committed 5bc2dc2 Merge

Sync with maint

By Jeff King (1) and Junio C Hamano (1)
* maint:
Update draft release notes to
osxkeychain: pull make config from top-level directory

  • Participants
  • Parent commits bd578b5, c464918

Comments (0)

Files changed (2)

File Documentation/RelNotes/

 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

File contrib/credential/osxkeychain/Makefile

 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) $<