Attachment #146960 for bug #214168

Lines 123-128 Link Here

(-)git-1.5.4.4.orig/Makefile (-6 / +31 lines)
123	#	123	#
124	# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's	124	# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
125	# MakeMaker (e.g. using ActiveState under Cygwin).	125	# MakeMaker (e.g. using ActiveState under Cygwin).
		126
		127	# Define NO_PERL if you do not want Perl scripts at all.
126	#	128	#
127	# Define NO_TCLTK if you do not want Tcl/Tk GUI.	129	# Define NO_TCLTK if you do not want Tcl/Tk GUI.
128	#	130	#
Lines 233-247 Link Here
233	git-stash.sh \	235	git-stash.sh \
234	git-help--browse.sh	236	git-help--browse.sh
235		237
		238	SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
		239	ifndef NO_PERL
236	SCRIPT_PERL = \	240	SCRIPT_PERL = \
237	git-add--interactive.perl \	241	git-add--interactive.perl \
238	git-archimport.perl git-cvsimport.perl git-relink.perl \	242	git-archimport.perl git-cvsimport.perl git-relink.perl \
239	git-cvsserver.perl git-remote.perl git-cvsexportcommit.perl \	243	git-cvsserver.perl git-remote.perl git-cvsexportcommit.perl \
240	git-send-email.perl git-svn.perl	244	git-send-email.perl git-svn.perl
241		245	SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \
242	SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \	246	git-instaweb
243	$(patsubst %.perl,%,$(SCRIPT_PERL)) \	247	else
244	git-instaweb	248	SCRIPT_PERL =
		249	endif
245		250
246	# ... and all the rest that could be moved out of bindir to gitexecdir	251	# ... and all the rest that could be moved out of bindir to gitexecdir
247	PROGRAMS = \	252	PROGRAMS = \
Lines 276-282 Link Here
276	ALL_PROGRAMS += git-merge-subtree$X	281	ALL_PROGRAMS += git-merge-subtree$X
277		282
278	# what 'all' will build but not install in gitexecdir	283	# what 'all' will build but not install in gitexecdir
279	OTHER_PROGRAMS = git$X gitweb/gitweb.cgi	284	OTHER_PROGRAMS = git$X
		285	ifndef NO_PERL
		286	OTHER_PROGRAMS += gitweb/gitweb.cgi
		287	endif
280		288
281	# Set paths to tools early so that they can be used for version tests.	289	# Set paths to tools early so that they can be used for version tests.
282	ifndef SHELL_PATH	290	ifndef SHELL_PATH
Lines 570-575 Link Here
570	endif	578	endif
571	endif	579	endif
572		580
		581	ifdef NO_PERL
		582	BASIC_CFLAGS += -DNO_PERL
		583	endif
		584
573	ifdef ZLIB_PATH	585	ifdef ZLIB_PATH
574	BASIC_CFLAGS += -I$(ZLIB_PATH)/include	586	BASIC_CFLAGS += -I$(ZLIB_PATH)/include
575	EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)	587	EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)
Lines 731-736 Link Here
731	ifeq ($(TCLTK_PATH),)	743	ifeq ($(TCLTK_PATH),)
732	NO_TCLTK=NoThanks	744	NO_TCLTK=NoThanks
733	endif	745	endif
		746	ifeq ($(PERL_PATH),)
		747	NO_PERL=NoThanks
		748	export NO_PERL
		749	export NO_PERL_MAKEMAKER
		750	endif
734		751
735	QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir	752	QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
736	QUIET_SUBDIR1 =	753	QUIET_SUBDIR1 =
Lines 803-809 Link Here
803	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all	820	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all
804	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all	821	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
805	endif	822	endif
		823	ifndef NO_PERL
806	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all	824	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
		825	endif
807	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)	826	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
808		827
809	strip: $(PROGRAMS) git$X	828	strip: $(PROGRAMS) git$X
Lines 844-849 Link Here
844	chmod +x $@+ && \	863	chmod +x $@+ && \
845	mv $@+ $@	864	mv $@+ $@
846		865
		866	ifndef NO_PERL
847	$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak	867	$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
848		868
849	perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL	869	perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
Lines 902-907 Link Here
902	$@.sh > $@+ && \	922	$@.sh > $@+ && \
903	chmod +x $@+ && \	923	chmod +x $@+ && \
904	mv $@+ $@	924	mv $@+ $@
		925	endif # NO_PERL
905		926
906	configure: configure.ac	927	configure: configure.ac
907	$(QUIET_GEN)$(RM) $@ $<+ && \	928	$(QUIET_GEN)$(RM) $@ $<+ && \
Lines 1052-1058 Link Here
1052	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'	1073	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
1053	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'	1074	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
1054	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install	1075	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
		1076	ifndef NO_PERL
1055	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install	1077	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
		1078	endif
1056	ifndef NO_TCLTK	1079	ifndef NO_TCLTK
1057	$(MAKE) -C gitk-git install	1080	$(MAKE) -C gitk-git install
1058	$(MAKE) -C git-gui install	1081	$(MAKE) -C git-gui install
Lines 1141-1149 Link Here
1141	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir	1164	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
1142	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz	1165	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
1143	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz	1166	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
1144	$(RM) gitweb/gitweb.cgi
1145	$(MAKE) -C Documentation/ clean	1167	$(MAKE) -C Documentation/ clean
		1168	ifndef NO_PERL
		1169	$(RM) gitweb/gitweb.cgi
1146	$(MAKE) -C perl clean	1170	$(MAKE) -C perl clean
		1171	endif
1147	$(MAKE) -C templates/ clean	1172	$(MAKE) -C templates/ clean
1148	$(MAKE) -C t/ clean	1173	$(MAKE) -C t/ clean
1149	ifndef NO_TCLTK	1174	ifndef NO_TCLTK




        free(seen);
}

#ifndef NO_PERL
static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
{
	const char **pathspec = get_pathspec(prefix, argv);

	free(args);
	return status;
}
#endif

static struct lock_file lock_file;


	OPT__DRY_RUN(&show_only),
	OPT__VERBOSE(&verbose),
	OPT_GROUP(""),
#ifndef NO_PERL
	OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
	OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
#endif
	OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
	OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
	OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),


	argc = parse_options(argc, argv, builtin_add_options,
			  builtin_add_usage, 0);
#ifndef NO_PERL
	if (patch_interactive)
		add_interactive = 1;
	if (add_interactive)
		exit(interactive_add(argc, argv, prefix));
#endif

	git_config(git_default_config);





	OPT_GROUP("Commit contents options"),
	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
	OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
#ifndef NO_PERL
	OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
#endif
	OPT_BOOLEAN('o', "only", &only, ""),
	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),

	struct path_list partial;
	const char **pathspec = NULL;

#ifndef NO_PERL
	if (interactive) {
		interactive_add(argc, argv, prefix);
		commit_style = COMMIT_AS_IS;
		return get_index_file();
	}
#endif

	if (read_cache() < 0)
		die("index file corrupt");

Lines 6-11 Link Here

(-)git-1.5.4.4.orig/t/lib-git-svn.sh (+6 lines)
6	test_done	6	test_done
7	exit	7	exit
8	fi	8	fi
		9	if test -n "$NO_PERL"
		10	then
		11	test_expect_success 'skipping git-svn tests, NO_PERL defined' :
		12	test_done
		13	exit
		14	fi
9		15
10	GIT_DIR=$PWD/.git	16	GIT_DIR=$PWD/.git
11	GIT_SVN_DIR=$GIT_DIR/svn/git-svn	17	GIT_SVN_DIR=$GIT_DIR/svn/git-svn

Lines 3-8 Link Here

(-)git-1.5.4.4.orig/t/t5505-remote.sh (+6 lines)
3	test_description='git remote porcelain-ish'	3	test_description='git remote porcelain-ish'
4		4
5	. ./test-lib.sh	5	. ./test-lib.sh
		6	if test -n "$NO_PERL"
		7	then
		8	test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' :
		9	test_done
		10	exit
		11	fi
6		12
7	setup_repository () {	13	setup_repository () {
8	mkdir "$1" && (	14	mkdir "$1" && (

Lines 38-44 Link Here

(-)git-1.5.4.4.orig/t/t7501-commit.sh (-2 / +2 lines)
38	"echo King of the bongo >file &&	38	"echo King of the bongo >file &&
39	git-commit -m foo -a file"	39	git-commit -m foo -a file"
40		40
41	test_expect_failure \	41	[ -z "$NO_PERL" ] && test_expect_failure \
42	"using paths with --interactive" \	42	"using paths with --interactive" \
43	"echo bong-o-bong >file &&	43	"echo bong-o-bong >file &&
44	echo 7 \| git-commit -m foo --interactive file"	44	echo 7 \| git-commit -m foo --interactive file"
Lines 119-125 Link Here
119	"echo 'gak' >file && \	119	"echo 'gak' >file && \
120	git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"	120	git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
121		121
122	test_expect_success \	122	[ -z "$NO_PERL" ] && test_expect_success \
123	"interactive add" \	123	"interactive add" \
124	"echo 7 \| git-commit --interactive \| grep 'What now'"	124	"echo 7 \| git-commit --interactive \| grep 'What now'"
125		125

Lines 2-7 Link Here

(-)git-1.5.4.4.orig/t/t9001-send-email.sh (+6 lines)
2		2
3	test_description='git-send-email'	3	test_description='git-send-email'
4	. ./test-lib.sh	4	. ./test-lib.sh
		5	if test -n "$NO_PERL"
		6	then
		7	test_expect_success 'skipping git-send-email tests, NO_PERL defined' :
		8	test_done
		9	exit
		10	fi
5		11
6	PROG='git send-email'	12	PROG='git send-email'
7	test_expect_success \	13	test_expect_success \

Lines 13-18 Link Here

(-)git-1.5.4.4.orig/t/t9200-git-cvsexportcommit.sh (+6 lines)
13	test_done	13	test_done
14	exit	14	exit
15	fi	15	fi
		16	if test -n "$NO_PERL"
		17	then
		18	test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' :
		19	test_done
		20	exit
		21	fi
16		22
17	CVSROOT=$(pwd)/cvsroot	23	CVSROOT=$(pwd)/cvsroot
18	CVSWORK=$(pwd)/cvswork	24	CVSWORK=$(pwd)/cvswork

Lines 17-22 Link Here

(-)git-1.5.4.4.orig/t/t9400-git-cvsserver-server.sh (+6 lines)
17	test_done	17	test_done
18	exit	18	exit
19	fi	19	fi
		20	if test -n "$NO_PERL"
		21	then
		22	test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' :
		23	test_done
		24	exit
		25	fi
20	perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 \|\| {	26	perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 \|\| {
21	test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :	27	test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
22	test_done	28	test_done

Lines 67-72 Link Here

(-)git-1.5.4.4.orig/t/t9500-gitweb-standalone-no-errors.sh (+7 lines)
67	}	67	}
68		68
69	. ./test-lib.sh	69	. ./test-lib.sh
		70	if test -n "$NO_PERL"
		71	then
		72	test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' :
		73	test_done
		74	exit
		75	fi
		76
70		77
71	perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {	78	perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {
72	test_expect_success 'skipping gitweb tests, perl version is too old' :	79	test_expect_success 'skipping gitweb tests, perl version is too old' :

Lines 9-14 Link Here

(-)git-1.5.4.4.orig/t/t9600-cvsimport.sh (+6 lines)
9	test_done	9	test_done
10	exit	10	exit
11	fi	11	fi
		12	if test -n "$NO_PERL"
		13	then
		14	test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' :
		15	test_done
		16	exit
		17	fi
12		18
13	cvsps_version=`cvsps -h 2>&1 \| sed -ne 's/cvsps version //p'`	19	cvsps_version=`cvsps -h 2>&1 \| sed -ne 's/cvsps version //p'`
14	case "$cvsps_version" in	20	case "$cvsps_version" in

Return to bug 214168

Lines 135-140 Link Here

(-)git-1.5.4.4.orig/builtin-add.c (+6 lines)
135	free(seen);	135	free(seen);
136	}	136	}
137		137
		138	#ifndef NO_PERL
138	static const char validate_pathspec(int argc, const char argv, const char *prefix)	139	static const char validate_pathspec(int argc, const char argv, const char *prefix)
139	{	140	{
140	const char **pathspec = get_pathspec(prefix, argv);	141	const char **pathspec = get_pathspec(prefix, argv);
Lines 170-175 Link Here
170	free(args);	171	free(args);
171	return status;	172	return status;
172	}	173	}
		174	#endif
173		175
174	static struct lock_file lock_file;	176	static struct lock_file lock_file;
175		177
Lines 182-189 Link Here
182	OPT__DRY_RUN(&show_only),	184	OPT__DRY_RUN(&show_only),
183	OPT__VERBOSE(&verbose),	185	OPT__VERBOSE(&verbose),
184	OPT_GROUP(""),	186	OPT_GROUP(""),
		187	#ifndef NO_PERL
185	OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),	188	OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
186	OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),	189	OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
		190	#endif
187	OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),	191	OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
188	OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),	192	OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
189	OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),	193	OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
Lines 198-207 Link Here
198		202
199	argc = parse_options(argc, argv, builtin_add_options,	203	argc = parse_options(argc, argv, builtin_add_options,
200	builtin_add_usage, 0);	204	builtin_add_usage, 0);
		205	#ifndef NO_PERL
201	if (patch_interactive)	206	if (patch_interactive)
202	add_interactive = 1;	207	add_interactive = 1;
203	if (add_interactive)	208	if (add_interactive)
204	exit(interactive_add(argc, argv, prefix));	209	exit(interactive_add(argc, argv, prefix));
		210	#endif
205		211
206	git_config(git_default_config);	212	git_config(git_default_config);
207		213

Lines 96-102 Link Here

(-)git-1.5.4.4.orig/builtin-commit.c (+4 lines)
96	OPT_GROUP("Commit contents options"),	96	OPT_GROUP("Commit contents options"),
97	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),	97	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
98	OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),	98	OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
		99	#ifndef NO_PERL
99	OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),	100	OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
		101	#endif
100	OPT_BOOLEAN('o', "only", &only, ""),	102	OPT_BOOLEAN('o', "only", &only, ""),
101	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),	103	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
102	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),	104	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
Lines 213-223 Link Here
213	struct path_list partial;	215	struct path_list partial;
214	const char **pathspec = NULL;	216	const char **pathspec = NULL;
215		217
		218	#ifndef NO_PERL
216	if (interactive) {	219	if (interactive) {
217	interactive_add(argc, argv, prefix);	220	interactive_add(argc, argv, prefix);
218	commit_style = COMMIT_AS_IS;	221	commit_style = COMMIT_AS_IS;
219	return get_index_file();	222	return get_index_file();
220	}	223	}
		224	#endif
221		225
222	if (read_cache() < 0)	226	if (read_cache() < 0)
223	die("index file corrupt");	227	die("index file corrupt");