On Wed, 14 Mar 2018, "Vivi, Rodrigo" <rodrigo.v...@intel.com> wrote: >> On Mar 14, 2018, at 2:08 AM, Jani Nikula <jani.nik...@intel.com> wrote: >> >> In qf line 411: >> git reset --hard $(git rev-parse --abbrev-ref @{u}) >> ^-- SC1083: This { is literal. Check expression (missing ;/\n?) or quote it. >> ^-- SC1083: This } is literal. Check expression (missing ;/\n?) or quote it. >> > > Sorry :( > >> Cc: Rodrigo Vivi <rodrigo.v...@intel.com> >> Cc: Lucas De Marchi <lucas.demar...@intel.com> >> Fixes: 0db9811183aa ("qf: Make qf_pull -f forcibly clean") >> Signed-off-by: Jani Nikula <jani.nik...@intel.com> > > Acked-by: Rodrigo Vivi <rodrigo.v...@intel.com>
Thanks, pushed. BR, Jani. > >> --- >> qf | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/qf b/qf >> index 6dcf26970726..d1499ada1951 100755 >> --- a/qf >> +++ b/qf >> @@ -408,7 +408,7 @@ function qf_pull >> cd patches >> >> if [[ $FORCE ]]; then >> - git reset --hard $(git rev-parse --abbrev-ref @{u}) >> + git reset --hard $(git rev-parse --abbrev-ref "@{u}") >> quiet_pop_all -f >> else >> git pull --ff-only >> -- >> 2.11.0 >> >> _______________________________________________ >> dim-tools mailing list >> dim-tools@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools