|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: Documentation/Makefile
|
|
|
|
|
--- Documentation/Makefile.orig 2014-02-14 22:57:09.000000000 +0100
|
|
|
|
|
+++ Documentation/Makefile 2014-04-30 20:50:38.971204664 +0200
|
|
|
|
|
@@ -106,11 +106,11 @@
|
|
|
|
|
--- Documentation/Makefile.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ Documentation/Makefile 2014-10-03 00:16:22.074209983 +0200
|
|
|
|
|
@@ -107,11 +107,11 @@
|
|
|
|
|
|
|
|
|
|
MAKEINFO = makeinfo
|
|
|
|
|
INSTALL_INFO = install-info
|
|
|
|
|
@ -16,8 +16,8 @@ Index: Documentation/Makefile
|
|
|
|
|
|
|
|
|
|
-include ../config.mak.autogen
|
|
|
|
|
Index: Makefile
|
|
|
|
|
--- Makefile.orig 2014-02-14 22:57:09.000000000 +0100
|
|
|
|
|
+++ Makefile 2014-04-30 20:50:38.971204664 +0200
|
|
|
|
|
--- Makefile.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ Makefile 2014-10-03 00:16:22.074209983 +0200
|
|
|
|
|
@@ -374,12 +374,12 @@
|
|
|
|
|
bindir = $(prefix)/$(bindir_relative)
|
|
|
|
|
mandir = $(prefix)/share/man
|
|
|
|
|
@ -33,7 +33,7 @@ Index: Makefile
|
|
|
|
|
htmldir = $(prefix)/share/doc/git-doc
|
|
|
|
|
ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
|
|
|
|
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
|
|
|
|
|
@@ -1107,10 +1107,10 @@
|
|
|
|
|
@@ -1128,10 +1128,10 @@
|
|
|
|
|
else
|
|
|
|
|
ifdef CURLDIR
|
|
|
|
|
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
|
|
|
|
|
@ -47,7 +47,7 @@ Index: Makefile
|
|
|
|
|
endif
|
|
|
|
|
ifdef NEEDS_SSL_WITH_CURL
|
|
|
|
|
CURL_LIBCURL += -lssl
|
|
|
|
|
@@ -2335,6 +2335,12 @@
|
|
|
|
|
@@ -2369,6 +2369,12 @@
|
|
|
|
|
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
|
|
|
|
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
|
|
|
|
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
|
|
|
@ -60,9 +60,22 @@ Index: Makefile
|
|
|
|
|
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
|
|
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
|
|
|
|
|
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
|
|
|
|
|
Index: builtin/index-pack.c
|
|
|
|
|
--- builtin/index-pack.c.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ builtin/index-pack.c 2014-10-03 00:16:22.074209983 +0200
|
|
|
|
|
@@ -182,6 +182,9 @@
|
|
|
|
|
#define work_lock()
|
|
|
|
|
#define work_unlock()
|
|
|
|
|
|
|
|
|
|
+#define type_cas_lock()
|
|
|
|
|
+#define type_cas_unlock()
|
|
|
|
|
+
|
|
|
|
|
#define deepest_delta_lock()
|
|
|
|
|
#define deepest_delta_unlock()
|
|
|
|
|
|
|
|
|
|
Index: config.mak.in
|
|
|
|
|
--- config.mak.in.orig 2014-02-14 22:57:09.000000000 +0100
|
|
|
|
|
+++ config.mak.in 2014-04-30 20:50:38.971204664 +0200
|
|
|
|
|
--- config.mak.in.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ config.mak.in 2014-10-03 00:16:22.084263568 +0200
|
|
|
|
|
@@ -14,9 +14,9 @@
|
|
|
|
|
prefix = @prefix@
|
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
|
@ -76,8 +89,8 @@ Index: config.mak.in
|
|
|
|
|
docdir = @docdir@
|
|
|
|
|
|
|
|
|
|
Index: perl/Makefile.PL
|
|
|
|
|
--- perl/Makefile.PL.orig 2014-02-14 22:57:09.000000000 +0100
|
|
|
|
|
+++ perl/Makefile.PL 2014-04-30 20:50:38.971204664 +0200
|
|
|
|
|
--- perl/Makefile.PL.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ perl/Makefile.PL 2014-10-03 00:16:22.084263568 +0200
|
|
|
|
|
@@ -58,5 +58,6 @@
|
|
|
|
|
PM => \%pm,
|
|
|
|
|
PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
|
|
|
|
|
@ -87,8 +100,8 @@ Index: perl/Makefile.PL
|
|
|
|
|
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
|
|
|
|
|
);
|
|
|
|
|
Index: sha1_file.c
|
|
|
|
|
--- sha1_file.c.orig 2014-02-14 22:57:09.000000000 +0100
|
|
|
|
|
+++ sha1_file.c 2014-04-30 20:50:38.971204664 +0200
|
|
|
|
|
--- sha1_file.c.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ sha1_file.c 2014-10-03 00:16:22.084263568 +0200
|
|
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
|
#include "bulk-checkin.h"
|
|
|
|
|
#include "streaming.h"
|
|
|
|
|
@ -98,8 +111,8 @@ Index: sha1_file.c
|
|
|
|
|
#ifndef O_NOATIME
|
|
|
|
|
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
|
|
|
|
|
Index: templates/Makefile
|
|
|
|
|
--- templates/Makefile.orig 2014-02-14 22:57:09.000000000 +0100
|
|
|
|
|
+++ templates/Makefile 2014-04-30 20:50:38.981167475 +0200
|
|
|
|
|
--- templates/Makefile.orig 2014-09-30 21:00:40.000000000 +0200
|
|
|
|
|
+++ templates/Makefile 2014-10-03 00:16:22.084263568 +0200
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
TAR ?= tar
|
|
|
|
|
RM ?= rm -f
|
|
|
|
|
|
