undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2012-05-24 17:37:40 -07:00
commit 5bc2dc29d4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/RelNotes/1.7.10.3.txt
View File

@ -4,6 +4,12 @@ Git v1.7.10.3 Release Notes
Fixes since v1.7.10.2 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. * Running "git checkout" on an unborn branch used to corrupt HEAD.
* When checking out another commit from an already detached state, we * When checking out another commit from an already detached state, we

7
contrib/credential/osxkeychain/Makefile
View File

@ -2,10 +2,13 @@ all:: git-credential-osxkeychain
CC = gcc CC = gcc
RM = rm -f RM = rm -f
CFLAGS = -g -Wall CFLAGS = -g -O2 -Wall
-include ../../../config.mak.autogen
-include ../../../config.mak
git-credential-osxkeychain: git-credential-osxkeychain.o 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 git-credential-osxkeychain.o: git-credential-osxkeychain.c
$(CC) -c $(CFLAGS) $< $(CC) -c $(CFLAGS) $<