On Fri, 11 Nov 2016, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
> Joonas rightly complained that the current output is useless and just
> confuses.
>
> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> ---
> dim | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/dim b/dim
> index dcdc19a9c82d..eba20509cda8 100755
> --- a/dim
> +++ b/dim
> @@ -325,9 +325,11 @@ function update_linux_next # branch next next-fixes fixes
>
> function check_conflicts
> {
> - if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' ; then
> + if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' &> /dev/null ; then
grep -q instead of redirecting to /dev/null?
> if [ -n "$1" ]; then
> - echo $*
> + echoerr $*
> + echoerr "See the section \"Resolving Conflicts when Rebuilding drm-intel-nightly\""
> + echoerr "in the drm-intel.rst documentation for how to handle this situation."
> fi
> exit 1
> fi
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
