From: Junio C Hamano <junkio@cox.net>
Date: Sun, 1 Oct 2006 06:38:24 +0000 (-0700)
Subject: Merge branch 'jc/gitpm'
X-Git-Tag: v1.4.3-rc1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69de8cc8527dc45a7aef76e8f1ace45b509b3712;p=git.git

Merge branch 'jc/gitpm'

* jc/gitpm: (52 commits)
  Remove -fPIC which was only needed for Git.xs
  Git.pm: Kill Git.xs for now
  Revert "Make it possible to set up libgit directly (instead of from the environment)"
  Revert "Git.pm: Introduce fast get_object() method"
  Revert "Convert git-annotate to use Git.pm"
  Fix compilation with Sun CC
  pass DESTDIR to the generated perl/Makefile
  Eliminate Scalar::Util usage from private-Error.pm
  Convert git-annotate to use Git.pm
  Git.pm: Introduce fast get_object() method
  Make it possible to set up libgit directly (instead of from the environment)
  Work around sed and make interactions on the backslash at the end of line.
  Git.pm: Introduce ident() and ident_person() methods
  Convert git-send-email to use Git.pm
  Git.pm: Add config() method
  Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
  INSTALL: a tip for running after building but without installing.
  Perly Git: make sure we do test the freshly built one.
  Git.pm: Don't #define around die
  Git.xs: older perl do not know const char *
  ...
---

69de8cc8527dc45a7aef76e8f1ace45b509b3712
diff --cc Makefile
index e649d72f6,187596573..dd3315852
--- a/Makefile
+++ b/Makefile
@@@ -522,12 -514,9 +529,12 @@@ endi
  ifdef NO_INET_NTOP
  	LIB_OBJS += compat/inet_ntop.o
  endif
 +ifdef NO_INET_PTON
 +	LIB_OBJS += compat/inet_pton.o
 +endif
  
  ifdef NO_ICONV
- 	ALL_CFLAGS += -DNO_ICONV
+ 	BASIC_CFLAGS += -DNO_ICONV
  endif
  
  ifdef PPC_SHA1
@@@ -566,15 -555,23 +573,24 @@@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PA
  PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
  GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
  
- ALL_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
+ LIBS = $(GITLIBS) $(EXTLIBS)
+ 
+ BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
  LIB_OBJS += $(COMPAT_OBJS)
+ 
+ ALL_CFLAGS += $(BASIC_CFLAGS)
+ ALL_LDFLAGS += $(BASIC_LDFLAGS)
+ 
  export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
+ 
+ 
  ### Build rules
  
 -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
 +all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \
 +	git-merge-recur$X
  
- all:
+ all: perl/Makefile
+ 	$(MAKE) -C perl
  	$(MAKE) -C templates
  
  strip: $(PROGRAMS) git$X
diff --cc builtin-repo-config.c
index 9cf12d32e,1d9373977..f60cee1dc
--- a/builtin-repo-config.c
+++ b/builtin-repo-config.c
@@@ -119,11 -119,13 +119,11 @@@ static int get_value(const char* key_, 
  	if (do_all)
  		ret = !seen;
  	else
- 		ret =  (seen == 1) ? 0 : 1;
+ 		ret = (seen == 1) ? 0 : seen > 1 ? 2 : 1;
  
  free_strings:
 -	if (repo_config)
 -		free(repo_config);
 -	if (global)
 -		free(global);
 +	free(repo_config);
 +	free(global);
  	return ret;
  }