From: Johannes Schindelin Date: Thu, 20 Oct 2005 15:13:24 +0000 (+0200) Subject: Make git-cherry-pick in target "all" X-Git-Tag: v0.99.9~76 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;p=git.git Make git-cherry-pick in target "all" Since git-cherry-pick is simply a copy of git-revert, it can be created before installing (so that it can be used without installing, too). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/.gitignore b/.gitignore index 975e773fe..52cb9e2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ git-check-ref-format git-checkout git-checkout-index git-cherry +git-cherry-pick git-clone git-clone-pack git-commit diff --git a/Makefile b/Makefile index 5ee72bc92..903c57cda 100644 --- a/Makefile +++ b/Makefile @@ -310,7 +310,7 @@ DEFINES += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER)) 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 template_dir ### Build rules @@ -351,6 +351,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py $@.py >$@ chmod +x $@ +git-cherry-pick: git-revert + cp $< $@ + %.o: %.c $(CC) -o $*.o -c $(ALL_CFLAGS) $< %.o: %.S @@ -410,7 +413,6 @@ check: install: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir)) $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir)) - $(INSTALL) git-revert $(call shellquote,$(DESTDIR)$(bindir)/git-cherry-pick) sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir)) $(MAKE) -C templates install $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))