From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:37 +0000 (-0700)
Subject: Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
X-Git-Tag: v1.7.7-rc0~97
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=13ac90a47878b0bb26375a1a6901a629aa2b2def;p=git.git

Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'

* bc/submodule-foreach-stdin-fix-1.7.4:
  git-submodule.sh: preserve stdin for the command spawned by foreach
  t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin

Conflicts:
	git-submodule.sh
---

13ac90a47878b0bb26375a1a6901a629aa2b2def
diff --cc git-submodule.sh
index cfd5aa604,07dc675ce..87c9452c8
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -320,8 -305,8 +324,8 @@@ cmd_foreach(
  				then
  					cmd_foreach "--recursive" "$@"
  				fi
- 			) ||
+ 			) <&3 3<&- ||
 -			die "Stopping at '$path'; script returned non-zero status."
 +			die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
  		fi
  	done
  }