File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed
Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff 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 ]]
You can’t perform that action at this time.
0 commit comments