mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/work-around-grep-opt-insanity'

Browse Source 
* rs/work-around-grep-opt-insanity:
  Protect scripted Porcelains from GREP_OPTIONS insanity
  mergetool--lib: simplify guess_merge_tool()

Conflicts:
	git-instaweb.sh
This commit is contained in:
Junio C Hamano
2009-11-25 11:45:07 -08:00
parent b073b7a990 e1622bfcba
commit ad7ace714d
9 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-submodule.sh
View File

@ -57,7 +57,7 @@ resolve_relative_url ()
#
module_list()
{
git ls-files --error-unmatch --stage -- "$@" | grep '^160000 '
git ls-files --error-unmatch --stage -- "$@" | sane_grep '^160000 '
}
#
@ -572,7 +572,7 @@ cmd_summary() {
cd_to_toplevel
# Get modified modules cared by user
modules=$(git $diff_cmd $cached --raw $head -- "$@" |
egrep '^:([0-7]* )?160000' |
sane_egrep '^:([0-7]* )?160000' |
while read mod_src mod_dst sha1_src sha1_dst status name
do
# Always show modules deleted or type-changed (blob<->module)
@ -586,7 +586,7 @@ cmd_summary() {
test -z "$modules" && return
git $diff_cmd $cached --raw $head -- $modules |
egrep '^:([0-7]* )?160000' |
sane_egrep '^:([0-7]* )?160000' |
cut -c2- |
while read mod_src mod_dst sha1_src sha1_dst status name
do