Skip to content

Commit 8235ca6

Browse files
committed
git-backport-diff: Replace egrep by grep -E
The command `egrep` is now considered obsolete (and prints that to stderr), replace it by `grep -E`. Signed-off-by: Hanna Reitz <[email protected]>
1 parent d9c095b commit 8235ca6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

git-backport-diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,13 @@ compare_git()
271271

272272
if [[ -n "$uphash" ]]
273273
then
274-
numdiff=`diff -u <(git diff --diff-algorithm=patience $DIFFOPTS $uphash^! |egrep ^[-+])\
275-
<(git diff --diff-algorithm=patience $DIFFOPTS $downhash^! |egrep ^[-+])\
276-
| egrep '^[-+]' | egrep -v '^[-+]{3}' |wc -l || true`
274+
numdiff=`diff -u <(git diff --diff-algorithm=patience $DIFFOPTS $uphash^! |grep -E ^[-+])\
275+
<(git diff --diff-algorithm=patience $DIFFOPTS $downhash^! |grep -E ^[-+])\
276+
| grep -E '^[-+]' | grep -E -v '^[-+]{3}' |wc -l || true`
277277
# for contextual diff checking, we will ignore hashes and line number offsets
278-
condiff=`diff -u <(git diff --diff-algorithm=patience $DIFFOPTS $uphash^\! |sed -e s/^@@.*@@//g |egrep -v ^index |egrep -v ^diff)\
279-
<(git diff --diff-algorithm=patience $DIFFOPTS $downhash^\!|sed -e s/^@@.*@@//g |egrep -v ^index |egrep -v ^diff)\
280-
| egrep '^[-+]' | egrep -v '^[-+]{3}'|wc -l || true`
278+
condiff=`diff -u <(git diff --diff-algorithm=patience $DIFFOPTS $uphash^\! |sed -e s/^@@.*@@//g |grep -E -v ^index |grep -E -v ^diff)\
279+
<(git diff --diff-algorithm=patience $DIFFOPTS $downhash^\!|sed -e s/^@@.*@@//g |grep -E -v ^index |grep -E -v ^diff)\
280+
| grep -E '^[-+]' | grep -E -v '^[-+]{3}'|wc -l || true`
281281
f="-"
282282
c="-"
283283
if [[ $sensitivity -gt 1 ]]

0 commit comments

Comments
 (0)