Merge in xonotic/xonotic.git: matthiaskrgr/all_grep
git-manager created issue #1608 on 2013-06-02T08:02:02Z:
Purpose of the branch:
implement ./all grep functionality (which skips binary files).
Repository: xonotic/xonotic.git Commit: f0d33157 Branch: matthiaskrgr/all_grep
Merge commands:
cd .
git checkout master
git reset --hard origin/master
git pull && git diff 'f0d331579348e39c1dbd5b8ed422d9cf2c715556'..'origin/matthiaskrgr/all_grep'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/matthiaskrgr/all_grep'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'matthiaskrgr/all_grep'
Diffstat:
misc/tools/all/git.subr | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
Revision log:
commit f0d331579348e39c1dbd5b8ed422d9cf2c715556
Author: Matthias Krüger
Commit: Matthias Krüger
./all grep: ident fix.
commit b5a9c693b589922bd5aa6f97c18b7f04cce60043
Author: Matthias Krüger
Commit: Matthias Krüger
Try implementing some grep functionality for ./all script.
Basically works like ./all each -k git grep -I
May still need some improvements.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/misc/tools/all/git.subr b/misc/tools/all/git.subr
index 69ad888..cf19f75 100644
— a/misc/tools/all/git.subr
**+ b/misc/tools/all/git.subr
@ -960,6 +960,14
@ case “$cmd” in
$ECHO " $SELF update|pull | ~~g ] "
handled=false
;;
- grep)
- for d in $repos; do
- if verbose cd “$d0/$d”; then
- git grep~~I “$@” || true
- cd “$d0”
- fi
- done
- ;; *) handled=false ;;