summaryrefslogtreecommitdiff
path: root/rev-list.c
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2005-07-29 15:50:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-07-30 00:21:52 (GMT)
commitdd53c7ab297cc491eb5164198e63d670c7b48530 (patch)
treeef6b9f5293b0b910cd59f916ffaa7021987771a9 /rev-list.c
parent28818ffada5c811b215b8fef7b61f8ae696abd17 (diff)
downloadgit-dd53c7ab297cc491eb5164198e63d670c7b48530.zip
git-dd53c7ab297cc491eb5164198e63d670c7b48530.tar.gz
git-dd53c7ab297cc491eb5164198e63d670c7b48530.tar.bz2
[PATCH] Support for NO_OPENSSL
Support for completely OpenSSL-less builds. FSF considers distributing GPL binaries with OpenSSL linked in as a legal problem so this is trouble e.g. for Debian, or some people might not want to install OpenSSL anyway. If you make NO_OPENSSL=1 you get completely OpenSSL-less build, disabling --merge-order and using Mozilla's SHA1 implementation. Ported from Cogito. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-list.c')
-rw-r--r--rev-list.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c
index 846aa2f..83a604a 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -548,9 +548,13 @@ int main(int argc, char **argv)
sort_in_topological_order(&list);
show_commit_list(list);
} else {
+#ifndef NO_OPENSSL
if (sort_list_in_merge_order(list, &process_commit)) {
- die("merge order sort failed\n");
+ die("merge order sort failed\n");
}
+#else
+ die("merge order sort unsupported, OpenSSL not linked");
+#endif
}
return 0;