On Thu, 30 Mar 2023, Rodrigo Vivi <rodrigo.v...@intel.com> wrote: > On Wed, Mar 29, 2023 at 10:53:53PM +0300, Ville Syrjälä wrote: >> On Wed, Feb 08, 2023 at 08:21:51AM -0500, Rodrigo Vivi wrote: >> > On Wed, Feb 08, 2023 at 03:32:43AM +0200, Ville Syrjala wrote: >> > > From: Ville Syrjälä <ville.syrj...@linux.intel.com> >> > > >> > > GNU grep 3.8 started to complain about backslashes where >> > > they're not needed: >> > > grep: warning: stray \ before / >> > > Get rid of them. >> > > >> > > Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com> >> > > --- >> > > dim | 6 +++--- >> > > 1 file changed, 3 insertions(+), 3 deletions(-) >> > > >> > > diff --git a/dim b/dim >> > > index b87b54259f8b..296feb9dd314 100755 >> > > --- a/dim >> > > +++ b/dim >> > > @@ -503,7 +503,7 @@ function dim_retip >> > > if repo_to_remote drm-tip &> /dev/null ; then >> > > new_upstream=$(repo_to_remote drm-tip)/drm-tip >> > > else >> > > - new_upstream=$(git branch -r | grep '\/drm-tip$') >> > > + new_upstream=$(git branch -r | grep '/drm-tip$') >> > >> > this I knew it would work... because of ' ' >> > >> > > fi >> > > upstream=$(git_find_tip "$branch") >> > > >> > > @@ -1124,12 +1124,12 @@ function check_diff_prefix >> > > local rv patch msg patch_recoded >> > > patch="$1" >> > > >> > > - rv=$(grep -q -E "^diff --git a\/.+ b\/.+$" $patch) >> > > + rv=$(grep -q -E "^diff --git a/.+ b/.+$" $patch) >> > >> > but here with " " >> > I had my doubts... but confirmed that it does work with previous >> > grep 3.7. >> > >> > I hope it doesn't go badly with older grep versions... >> > >> > with this hope >> > >> > Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com> >> >> I can't push this btw. -EPERM or something. > > per rules we need Jani's or Daniel's ack, then I can help on > pushing it...
Acked-by: Jani Nikula <jani.nik...@intel.com> Daniel, is it time we switched the whole thing to merge request process btw? BR, Jani. > >> >> > >> > >> > > if [ -z "$rv" ]; then >> > > msg=$(mktemp --tmpdir dim-msg.XXXXXX) >> > > patch_recoded=$(mktemp --tmpdir dim-patch.XXXXXX) >> > > git mailinfo "$msg" "$patch_recoded" < $patch >/dev/null >> > > - rv=$(grep -q -E "^diff --git a\/.+ b\/.+$" >> > > $patch_recoded) >> > > + rv=$(grep -q -E "^diff --git a/.+ b/.+$" $patch_recoded) >> > > rm "$msg" "$patch_recoded" >> > > fi >> > > >> > > -- >> > > 2.39.1 >> > > >> >> -- >> Ville Syrjälä >> Intel -- Jani Nikula, Intel Open Source Graphics Center
