Skip to content

Commit

Permalink
Ship our own copy of subprocess.py
Browse files Browse the repository at this point in the history
so people without the latest Python could run merge-recursive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Sep 20, 2005
1 parent 0a2ba73 commit 343d35c
Show file tree
Hide file tree
Showing 4 changed files with 1,176 additions and 9 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#
# Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz).
#
# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
#
# Define COLLISION_CHECK below if you believe that SHA1's
# 1461501637330902918203684832716283019655932542976 hashes do not give you
# sufficient guarantee that no collisions between objects will ever happen.
Expand Down Expand Up @@ -117,6 +119,10 @@ PROGRAMS += git-ssh-pull git-ssh-push
PYMODULES = \
gitMergeCommon.py

ifdef WITH_OWN_SUBPROCESS_PY
PYMODULES += compat/subprocess.py
endif

ifdef WITH_SEND_EMAIL
SCRIPT_PERL += git-send-email.perl
endif
Expand Down
Loading

0 comments on commit 343d35c

Please sign in to comment.