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 <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/.gitignore b/.gitignore
index 975e773fec56c7cf747f73b4822bffb017e2e79f..52cb9e2c08ce3b77d9a39e461b410759bfe402f0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ git-check-ref-format
 git-checkout
 git-checkout-index
 git-cherry
 git-checkout
 git-checkout-index
 git-cherry

+git-cherry-pick

 git-clone
 git-clone-pack
 git-commit
 git-clone
 git-clone-pack
 git-commit

diff --git a/Makefile b/Makefile
index 5ee72bc9248cea430fd28bbe16076f72dcb8ac1d..903c57cdaf2769b323f4da8a7de3eb5bb3f8cca9 100644 (file)
--- 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)) \
 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
 
 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
 ### Build rules


@@ -351,6 +351,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
            $@.py >$@
        chmod +x $@
 
            $@.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


@@ -410,7 +413,6 @@ check:
 install: $(PROGRAMS) $(SCRIPTS)
        $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
        $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
 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))
        sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir))
        $(MAKE) -C templates install
        $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))