author | Junio C Hamano <gitster@pobox.com> | |
Tue, 14 Dec 2010 16:57:38 +0000 (08:57 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 14 Dec 2010 16:58:09 +0000 (08:58 -0800) |
* 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>
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>
Documentation/RelNotes/1.7.3.4.txt | patch | blob | history | |
Documentation/RelNotes/1.7.4.txt | patch | blob | history | |
Makefile | patch | blob | history |
index 925178f6089fbeff38add340563d803bc65a7365..c2a46a2e96b9b5c415282dfaca39092d06067c86 100644 (file)
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.
* "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
index 6084f7ddf6d4c977b5ac29043186c73920ca947d..c1ed23a0c6decbfe4b4ab141b00d24d2f399b872 100644 (file)
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.
diff --git a/Makefile b/Makefile
index 5103dd4666a5bc2447c80421314aca8c5ffa7b13..8cf7da9838d62de82c18656007f882f02963de8a 100644 (file)
--- a/Makefile
+++ b/Makefile
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