projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Subject: [PATCH] git-fetch-pack: Do not use git-rev-list
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
a201187
..
e76e6c4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-93,7
+93,8
@@
SCRIPT_SH = \
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
- git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl
+ git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \
+ git-findtags.perl git-svnimport.perl git-mv.perl
SCRIPT_PYTHON = \
git-merge-recursive.py
SCRIPT_PYTHON = \
git-merge-recursive.py
@@
-110,18
+111,18
@@
PROGRAMS = \
git-convert-objects$X git-diff-files$X \
git-diff-index$X git-diff-stages$X \
git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
git-convert-objects$X git-diff-files$X \
git-diff-index$X git-diff-stages$X \
git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
- git-hash-object$X git-init-db$X \
+ git-hash-object$X git-in
dex-pack$X git-in
it-db$X \
git-local-fetch$X git-ls-files$X git-ls-tree$X git-merge-base$X \
git-merge-index$X git-mktag$X git-pack-objects$X git-patch-id$X \
git-peek-remote$X git-prune-packed$X git-read-tree$X \
git-receive-pack$X git-rev-list$X git-rev-parse$X \
git-local-fetch$X git-ls-files$X git-ls-tree$X git-merge-base$X \
git-merge-index$X git-mktag$X git-pack-objects$X git-patch-id$X \
git-peek-remote$X git-prune-packed$X git-read-tree$X \
git-receive-pack$X git-rev-list$X git-rev-parse$X \
- git-send-pack$X git-show-branch$X \
+ git-send-pack$X git-show-branch$X
git-shell$X
\
git-show-index$X git-ssh-fetch$X \
git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
git-unpack-objects$X git-update-index$X git-update-server-info$X \
git-upload-pack$X git-verify-pack$X git-write-tree$X \
git-show-index$X git-ssh-fetch$X \
git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
git-unpack-objects$X git-update-index$X git-update-server-info$X \
git-upload-pack$X git-verify-pack$X git-write-tree$X \
- git-update-ref$X git-symbolic-ref$X \
- $(SIMPLE_PROGRAMS)
+ git-update-ref$X git-symbolic-ref$X
git-check-ref-format$X
\
+
git-name-rev$X
$(SIMPLE_PROGRAMS)
# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull$X git-ssh-push$X
# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@
-150,7
+151,7
@@
LIB_H = \
DIFF_OBJS = \
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
DIFF_OBJS = \
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
- diffcore-pickaxe.o diffcore-rename.o
+ diffcore-pickaxe.o diffcore-rename.o
tree-diff.o
LIB_OBJS = \
blob.o commit.o connect.o count-delta.o csum-file.o \
LIB_OBJS = \
blob.o commit.o connect.o count-delta.o csum-file.o \
@@
-158,11
+159,18
@@
LIB_OBJS = \
object.o pack-check.o patch-delta.o path.o pkt-line.o \
quote.o read-cache.o refs.o run-command.o \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
object.o pack-check.o patch-delta.o path.o pkt-line.o \
quote.o read-cache.o refs.o run-command.o \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
- tag.o tree.o usage.o $(DIFF_OBJS)
+ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
+ $(DIFF_OBJS)
LIBS = $(LIB_FILE)
LIBS += -lz
LIBS = $(LIB_FILE)
LIBS += -lz
+# Shell quote;
+# Result of this needs to be placed inside ''
+shq = $(subst ','\'',$(1))
+# This has surrounding ''
+shellquote = '$(call shq,$(1))'
+
#
# Platform specific tweaks
#
#
# Platform specific tweaks
#
@@
-196,6
+204,7
@@
ifeq ($(uname_O),Cygwin)
PLATFORM_DEFINES += -DUSE_SYMLINK_HEAD=0
endif
ifeq ($(uname_S),OpenBSD)
PLATFORM_DEFINES += -DUSE_SYMLINK_HEAD=0
endif
ifeq ($(uname_S),OpenBSD)
+ NO_STRCASESTR = YesPlease
NEEDS_LIBICONV = YesPlease
PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
endif
NEEDS_LIBICONV = YesPlease
PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
endif
@@
-203,6
+212,8
@@
ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease
endif
ARM_SHA1 = YesPlease
endif
+-include config.mak
+
ifndef NO_CURL
ifdef CURLDIR
# This is still problematic -- gcc does not want -R.
ifndef NO_CURL
ifdef CURLDIR
# This is still problematic -- gcc does not want -R.
@@
-235,7
+246,7
@@
ifndef NO_OPENSSL
OPENSSL_LINK =
endif
else
OPENSSL_LINK =
endif
else
- DEFINES +=
'-DNO_OPENSSL'
+ DEFINES +=
-DNO_OPENSSL
MOZILLA_SHA1 = 1
OPENSSL_LIBSSL =
endif
MOZILLA_SHA1 = 1
OPENSSL_LIBSSL =
endif
@@
-265,7
+276,7
@@
ifdef NEEDS_NSL
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
- DEFINES += -Dstrcasestr=gitstrcasestr
+ DEFINES += -Dstrcasestr=gitstrcasestr
-DNO_STRCASESTR=1
LIB_OBJS += compat/strcasestr.o
endif
ifdef NO_MMAP
LIB_OBJS += compat/strcasestr.o
endif
ifdef NO_MMAP
@@
-294,14
+305,14
@@
endif
endif
endif
endif
endif
-DEFINES +=
'-DSHA1_HEADER=$(SHA1_HEADER)'
+DEFINES +=
-DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER))
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
- gitk
+ gitk
git-cherry-pick
-export prefix TAR INSTALL DESTDIR SHELL_PATH
+export prefix TAR INSTALL DESTDIR SHELL_PATH
template_dir
### Build rules
all: $(PROGRAMS) $(SCRIPTS)
### Build rules
all: $(PROGRAMS) $(SCRIPTS)
@@
-311,7
+322,7
@@
all:
git: git.sh Makefile
rm -f $@+ $@
git: git.sh Makefile
rm -f $@+ $@
- sed -e '1s|#!.*/sh|#!$(
SHELL_PATH
)|' \
+ sed -e '1s|#!.*/sh|#!$(
call shq,$(SHELL_PATH)
)|' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-e 's/@@X@@/$(X)/g' \
$(GIT_LIST_TWEAK) <$@.sh >$@+
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-e 's/@@X@@/$(X)/g' \
$(GIT_LIST_TWEAK) <$@.sh >$@+
@@
-320,26
+331,29
@@
git: git.sh Makefile
$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
rm -f $@
$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
rm -f $@
- sed -e '1s|#!.*/sh|#!$(
SHELL_PATH
)|' \
+ sed -e '1s|#!.*/sh|#!$(
call shq,$(SHELL_PATH)
)|' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.sh >$@
chmod +x $@
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
rm -f $@
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.sh >$@
chmod +x $@
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
rm -f $@
- sed -e '1s|#!.*perl|#!$(
PERL_PATH
)|' \
+ sed -e '1s|#!.*perl|#!$(
call shq,$(PERL_PATH)
)|' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.perl >$@
chmod +x $@
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
rm -f $@
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.perl >$@
chmod +x $@
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
rm -f $@
- sed -e '1s|#!.*python|#!$(
PYTHON_PATH
)|' \
- -e 's|@@GIT_PYTHON_PATH@@|$(
GIT_PYTHON_DIR
)|g' \
+ sed -e '1s|#!.*python|#!$(
call shq,$(PYTHON_PATH)
)|' \
+ -e 's|@@GIT_PYTHON_PATH@@|$(
call shq,$(GIT_PYTHON_DIR)
)|g' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.py >$@
chmod +x $@
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.py >$@
chmod +x $@
+git-cherry-pick: git-revert
+ cp $< $@
+
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
%.o: %.S
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
%.o: %.S
@@
-365,7
+379,7
@@
git-rev-list$X: LIBS += $(OPENSSL_LIBSSL)
init-db.o: init-db.c
$(CC) -c $(ALL_CFLAGS) \
init-db.o: init-db.c
$(CC) -c $(ALL_CFLAGS) \
- -DDEFAULT_GIT_TEMPLATE_DIR=
'"$(template_dir)"'
$*.c
+ -DDEFAULT_GIT_TEMPLATE_DIR=
$(call shellquote,"$(template_dir)")
$*.c
$(LIB_OBJS): $(LIB_H)
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H)
$(LIB_OBJS): $(LIB_H)
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H)
@@
-397,13
+411,12
@@
check:
### Installation rules
install: $(PROGRAMS) $(SCRIPTS)
### Installation rules
install: $(PROGRAMS) $(SCRIPTS)
- $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
- $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
- $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
- sh ./cmd-rename.sh $(DESTDIR)$(bindir)
+ $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
+ $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
+ sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir))
$(MAKE) -C templates install
$(MAKE) -C templates install
- $(INSTALL) -d -m755 $(
DESTDIR)$(GIT_PYTHON_DIR
)
- $(INSTALL) $(PYMODULES) $(
DESTDIR)$(GIT_PYTHON_DIR
)
+ $(INSTALL) -d -m755 $(
call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR)
)
+ $(INSTALL) $(PYMODULES) $(
call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR)
)
install-doc:
$(MAKE) -C Documentation install
install-doc:
$(MAKE) -C Documentation install