mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 04:22:06 +02:00
Code

Merge branch 'maint'

Browse Source 
* maint:
  Prepare for 1.7.3.4
  use persistent memory for rejected paths
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD
  Do not link with -lcrypto under NO_OPENSSL

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-12-14 08:57:38 -08:00
commit e6b71b3289
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/RelNotes/1.7.3.4.txt
View File

@ -14,6 +14,11 @@ Fixes since v1.7.3.3
colon between the hours and minutes part (e.g. "-08:00" instead of
"-0800").
* "git checkout" removed an untracked file "foo" from the working
tree when switching to a branch that contains a tracked path
"foo/bar". Prevent this, just like the case where the conflicting
path were "foo" (c752e7f..7980872d).
* "git cherry-pick" or "git revert" refused to work when a path that
would be modified by the operation was stat-dirty without a real
difference in the contents of the file.
@ -21,9 +26,14 @@ Fixes since v1.7.3.3
* "git diff --check" reported an incorrect line number for added
blank lines at the end of file.
* "git imap-send" failed to build under NO_OPENSSL.
* Setting log.decorate configuration variable to "0" or "1" to mean
"false" or "true" did not work.
* "git push" over dumb HTTP protocol did not work against WebDAV
servers that did not terminate a collection name with a slash.
* "git tag -v" did not work with GPG signatures in rfc1991 mode.
* The post-receive-email sample hook was accidentally broken in 1.7.3.3

5
Documentation/RelNotes/1.7.4.txt
View File

@ -96,11 +96,6 @@ Fixes since v1.7.3
All of the fixes in v1.7.3.X maintenance series are included in this
release, unless otherwise noted.
* "git checkout" removed an untracked file "foo" from the working
tree when switching to a branch that contains a tracked path
"foo/bar". Prevent this, just like the case where the conflicting
path were "foo" (c752e7f..7980872d).
* "git log --author=me --author=her" did not find commits written by
me or by her; instead it looked for commits written by me and by
her, which is impossible.

4
Makefile
View File

@ -1303,11 +1303,15 @@ else
BLK_SHA1 = 1
OPENSSL_LIBSSL =
endif
ifdef NO_OPENSSL
LIB_4_CRYPTO =
else
ifdef NEEDS_SSL_WITH_CRYPTO
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
else
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif
endif
ifdef NEEDS_LIBICONV
ifdef ICONVDIR
BASIC_CFLAGS += -I$(ICONVDIR)/include