From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:44 +0000 (-0700)
Subject: Merge branch 'gv/portable'
X-Git-Tag: v1.7.2-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d676d85f772ce3a100b6f0dddd1c34a7e4313cf;p=thirdparty%2Fgit.git

Merge branch 'gv/portable'

* gv/portable:
  test-lib: use DIFF definition from GIT-BUILD-OPTIONS
  build: propagate $DIFF to scripts
  Makefile: Tru64 portability fix
  Makefile: HP-UX 10.20 portability fixes
  Makefile: HPUX11 portability fixes
  Makefile: SunOS 5.6 portability fix
  inline declaration does not work on AIX
  Allow disabling "inline"
  Some platforms lack socklen_t type
  Make NO_{INET_NTOP,INET_PTON} configured independently
  Makefile: some platforms do not have hstrerror anywhere
  git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
  test_cmp: do not use "diff -u" on platforms that lack one
  fixup: do not unconditionally disable "diff -u"
  tests: use "test_cmp", not "diff", when verifying the result
  Do not use "diff" found on PATH while building and installing
  enums: omit trailing comma for portability
  Makefile: -lpthread may still be necessary when libc has only pthread stubs
  Rewrite dynamic structure initializations to runtime assignment
  Makefile: pass CPPFLAGS through to fllow customization

Conflicts:
	Makefile
	wt-status.h
---

8d676d85f772ce3a100b6f0dddd1c34a7e4313cf
diff --cc Makefile
index a863a068ab,6b3b59bef5..3dc072fc81
--- a/Makefile
+++ b/Makefile
@@@ -286,7 -288,7 +292,7 @@@ lib = li
  # DESTDIR=
  pathsep = :
  
--export prefix bindir sharedir sysconfdir
++export prefix bindir sharedir sysconfdir gitwebdir
  
  CC = gcc
  AR = ar
@@@ -1884,7 -1939,7 +1950,8 @@@ GIT-CFLAGS: FORC
  GIT-BUILD-OPTIONS: FORCE
  	@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
  	@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@
+ 	@echo DIFF=\''$(subst ','\'',$(subst ','\'',$(DIFF)))'\' >>$@
 +	@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
  	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
  	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
@@@ -1983,7 -2044,6 +2056,7 @@@ install: al
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
- 	$(MAKE) -C gitweb gitwebdir=$(gitwebdir_SQ) install
++	$(MAKE) -C gitweb install
  endif
  ifndef NO_PYTHON
  	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --cc builtin/commit.c
index a861686643,30a00e0b63..0e3ae3c11d
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -91,9 -90,8 +91,9 @@@ static int null_termination
  static enum {
  	STATUS_FORMAT_LONG,
  	STATUS_FORMAT_SHORT,
- 	STATUS_FORMAT_PORCELAIN,
+ 	STATUS_FORMAT_PORCELAIN
  } status_format = STATUS_FORMAT_LONG;
 +static int status_show_branch;
  
  static int opt_parse_m(const struct option *opt, const char *arg, int unset)
  {
diff --cc t/t3200-branch.sh
index 9d2c06ea69,8818d0de68..859b99abf1
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -222,32 -222,8 +222,32 @@@ test_expect_success 
       git checkout -b g/h/i -l master &&
  	 test -f .git/refs/heads/g/h/i &&
  	 test -f .git/logs/refs/heads/g/h/i &&
- 	 diff expect .git/logs/refs/heads/g/h/i'
+ 	 test_cmp expect .git/logs/refs/heads/g/h/i'
  
 +test_expect_success 'checkout -b makes reflog by default' '
 +	git checkout master &&
 +	git config --unset core.logAllRefUpdates &&
 +	git checkout -b alpha &&
 +	test -f .git/logs/refs/heads/alpha &&
 +	PAGER= git reflog show alpha
 +'
 +
 +test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
 +	git checkout master &&
 +	git config core.logAllRefUpdates false &&
 +	git checkout -b beta &&
 +	! test -f .git/logs/refs/heads/beta &&
 +	test_must_fail PAGER= git reflog show beta
 +'
 +
 +test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
 +	git checkout master &&
 +	git checkout -lb gamma &&
 +	git config --unset core.logAllRefUpdates &&
 +	test -f .git/logs/refs/heads/gamma &&
 +	PAGER= git reflog show gamma
 +'
 +
  test_expect_success 'avoid ambiguous track' '
  	git config branch.autosetupmerge true &&
  	git config remote.ambi1.url lalala &&
diff --cc wt-status.h
index 4f190454e5,389e65f68a..4cd74c4b32
--- a/wt-status.h
+++ b/wt-status.h
@@@ -11,9 -11,7 +11,9 @@@ enum color_wt_status 
  	WT_STATUS_CHANGED,
  	WT_STATUS_UNTRACKED,
  	WT_STATUS_NOBRANCH,
 -	WT_STATUS_UNMERGED
 +	WT_STATUS_UNMERGED,
 +	WT_STATUS_LOCAL_BRANCH,
- 	WT_STATUS_REMOTE_BRANCH,
++	WT_STATUS_REMOTE_BRANCH
  };
  
  enum untracked_status_type {