Skip to content

Commit 7cdbff1

Browse files
author
Junio C Hamano
committed
remove merge-recursive-old
This frees the Porcelain-ish that comes with the core Python-free. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 5942706 commit 7cdbff1

File tree

14 files changed

+10
-2497
lines changed

14 files changed

+10
-2497
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ git-merge-one-file
6666
git-merge-ours
6767
git-merge-recur
6868
git-merge-recursive
69-
git-merge-recursive-old
7069
git-merge-resolve
7170
git-merge-stupid
7271
git-mktag

‎INSTALL‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ Issues of note:
9999
- "perl" and POSIX-compliant shells are needed to use most of
100100
the barebone Porcelainish scripts.
101101

102-
- "python" 2.3 or more recent; if you have 2.3, you may need
103-
to build with "make WITH_OWN_SUBPROCESS_PY=YesPlease".
104-
105102
- Some platform specific issues are dealt with Makefile rules,
106103
but depending on your specific installation, you may not
107104
have all the libraries/tools needed, or you may have

‎Makefile‎

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ all:
6969
#
7070
# Define NO_MMAP if you want to avoid mmap.
7171
#
72-
# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
73-
#
7472
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
7573
#
7674
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
@@ -116,7 +114,6 @@ prefix = $(HOME)
116114
bindir = $(prefix)/bin
117115
gitexecdir = $(bindir)
118116
template_dir = $(prefix)/share/git-core/templates/
119-
GIT_PYTHON_DIR = $(prefix)/share/git-core/python
120117
# DESTDIR=
121118

122119
# default configuration for gitweb
@@ -135,7 +132,7 @@ GITWEB_FAVICON = git-favicon.png
135132
GITWEB_SITE_HEADER =
136133
GITWEB_SITE_FOOTER =
137134

138-
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
135+
export prefix bindir gitexecdir template_dir
139136

140137
CC = gcc
141138
AR = ar
@@ -179,12 +176,8 @@ SCRIPT_PERL = \
179176
git-svnimport.perl git-cvsexportcommit.perl \
180177
git-send-email.perl git-svn.perl
181178

182-
SCRIPT_PYTHON = \
183-
git-merge-recursive-old.py
184-
185179
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
186180
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
187-
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
188181
git-cherry-pick git-status git-instaweb
189182

190183
# ... and all the rest that could be moved out of bindir to gitexecdir
@@ -227,12 +220,6 @@ endif
227220
ifndef PERL_PATH
228221
PERL_PATH = /usr/bin/perl
229222
endif
230-
ifndef PYTHON_PATH
231-
PYTHON_PATH = /usr/bin/python
232-
endif
233-
234-
PYMODULES = \
235-
gitMergeCommon.py
236223

237224
LIB_FILE=libgit.a
238225
XDIFF_LIB=xdiff/lib.a
@@ -423,16 +410,6 @@ endif
423410
-include config.mak.autogen
424411
-include config.mak
425412

426-
ifdef WITH_OWN_SUBPROCESS_PY
427-
PYMODULES += compat/subprocess.py
428-
else
429-
ifeq ($(NO_PYTHON),)
430-
ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
431-
PYMODULES += compat/subprocess.py
432-
endif
433-
endif
434-
endif
435-
436413
ifndef NO_CURL
437414
ifdef CURLDIR
438415
# This is still problematic -- gcc does not always want -R.
@@ -574,8 +551,6 @@ prefix_SQ = $(subst ','\'',$(prefix))
574551

575552
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
576553
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
577-
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
578-
GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
579554

580555
LIBS = $(GITLIBS) $(EXTLIBS)
581556

@@ -622,7 +597,6 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
622597
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
623598
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
624599
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
625-
-e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
626600
$@.sh >$@+
627601
chmod +x $@+
628602
mv $@+ $@
@@ -644,15 +618,6 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
644618
chmod +x $@+
645619
mv $@+ $@
646620

647-
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py GIT-CFLAGS
648-
rm -f $@ $@+
649-
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
650-
-e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR_SQ)|g' \
651-
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
652-
$@.py >$@+
653-
chmod +x $@+
654-
mv $@+ $@
655-
656621
git-cherry-pick: git-revert
657622
cp $< $@+
658623
mv $@+ $@
@@ -689,7 +654,6 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
689654
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
690655
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
691656
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
692-
-e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
693657
-e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
694658
-e '/@@GITWEB_CGI@@/d' \
695659
-e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
@@ -709,7 +673,6 @@ configure: configure.ac
709673
git$X git.spec \
710674
$(patsubst %.sh,%,$(SCRIPT_SH)) \
711675
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
712-
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
713676
: GIT-VERSION-FILE
714677

715678
%.o: %.c GIT-CFLAGS
@@ -783,7 +746,7 @@ tags:
783746
find . -name '*.[hcS]' -print | xargs ctags -a
784747

785748
### Detect prefix changes
786-
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):$(GIT_PYTHON_DIR_SQ):\
749+
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
787750
$(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
788751

789752
GIT-CFLAGS: .FORCE-GIT-CFLAGS
@@ -799,7 +762,6 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
799762
# However, the environment gets quite big, and some programs have problems
800763
# with that.
801764

802-
export NO_PYTHON
803765
export NO_SVN_TESTS
804766

805767
test: all
@@ -834,8 +796,6 @@ install: all
834796
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
835797
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
836798
$(MAKE) -C perl install
837-
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
838-
$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
839799
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
840800
then \
841801
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
@@ -922,7 +882,6 @@ check-docs::
922882
case "$$v" in \
923883
git-merge-octopus | git-merge-ours | git-merge-recursive | \
924884
git-merge-resolve | git-merge-stupid | git-merge-recur | \
925-
git-merge-recursive-old | \
926885
git-ssh-pull | git-ssh-push ) continue ;; \
927886
esac ; \
928887
test -f "Documentation/$$v.txt" || \

0 commit comments

Comments
 (0)