From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Apr 2016 19:47:44 +0000 (-0700)
Subject: Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init
X-Git-Tag: v2.9.0-rc0~45^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee30f17805f51d372ff9c5036f1d142c167e5e34;p=git

Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init

"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.

Any further comments?  Otherwise will merge to 'next'.

* sb/submodule-path-misc-bugs: (600 commits)
  t7407: make expectation as clear as possible
  submodule update: test recursive path reporting from subdirectory
  submodule update: align reporting path for custom command execution
  submodule status: correct path handling in recursive submodules
  submodule update --init: correct path handling in recursive submodules
  submodule foreach: correct path display in recursive submodules
  Git 2.8
  Documentation: fix git-p4 AsciiDoc formatting
  mingw: skip some tests in t9115 due to file name issues
  t1300: fix the new --show-origin tests on Windows
  t1300-repo-config: make it resilient to being run via 'sh -x'
  config --show-origin: report paths with forward slashes
  submodule: fix regression for deinit without submodules
  l10n: pt_PT: Update and add new translations
  l10n: ca.po: update translation
  Git 2.8-rc4
  Documentation: fix broken linkgit to git-config
  Documentation: use ASCII quotation marks in git-p4
  Revert "config.mak.uname: use clang for Mac OS X 10.6"
  git-compat-util: st_add4: work around gcc 4.2.x compiler crash
  ...
---

ee30f17805f51d372ff9c5036f1d142c167e5e34
diff --cc builtin/fetch.c
index 5aa1c2de44,e4639d8eb1..f8455bde7a
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -37,7 -37,8 +37,8 @@@ static int prune = -1; /* unspecified *
  static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
  static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
  static int tags = TAGS_DEFAULT, unshallow, update_shallow;
 -static int max_children = 1;
 +static int max_children = -1;
+ static enum transport_family family;
  static const char *depth;
  static const char *upload_pack;
  static struct strbuf default_rla = STRBUF_INIT;
diff --cc git-submodule.sh
index 86018ee9c5,753a90d307..07290d07ae
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -740,12 -763,24 +758,17 @@@ cmd_update(
  			then
  				# Run fetch only if $sha1 isn't present or it
  				# is not reachable from a ref.
- 				(clear_local_git_env; cd "$sm_path" &&
- 					( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
- 					 test -z "$rev") || git-fetch)) ||
+ 				is_tip_reachable "$sm_path" "$sha1" ||
+ 				fetch_in_submodule "$sm_path" ||
  				die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
+ 
+ 				# Now we tried the usual fetch, but $sha1 may
+ 				# not be reachable from any of the refs
+ 				is_tip_reachable "$sm_path" "$sha1" ||
+ 				fetch_in_submodule "$sm_path" "$sha1" ||
+ 				die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
  			fi
  
 -			# Is this something we just cloned?
 -			case ";$cloned_modules;" in
 -			*";$name;"*)
 -				# then there is no local change to integrate
 -				update_module=checkout ;;
 -			esac
 -
  			must_die_on_failure=
  			case "$update_module" in
  			checkout)
diff --cc strbuf.h
index d4f2aa1365,f72fd14c2e..7987405313
--- a/strbuf.h
+++ b/strbuf.h
@@@ -386,16 -386,11 +386,17 @@@ extern ssize_t strbuf_read_file(struct 
   */
  extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
  
 +/**
 + * Write the whole content of the strbuf to the stream not stopping at
 + * NUL bytes.
 + */
 +extern ssize_t strbuf_write(struct strbuf *sb, FILE *stream);
 +
  /**
-  * Read a line from a FILE *, overwriting the existing contents
-  * of the strbuf. The second argument specifies the line
-  * terminator character, typically `'\n'`.
+  * Read a line from a FILE *, overwriting the existing contents of
+  * the strbuf.  The strbuf_getline*() family of functions share
+  * this signature, but have different line termination conventions.
+  *
   * Reading stops after the terminator or at EOF.  The terminator
   * is removed from the buffer before returning.  Returns 0 unless
   * there was nothing left before EOF, in which case it returns `EOF`.