From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] dim: Improve the error output when rebuild-nightly fails
Date: Fri, 11 Nov 2016 15:37:04 +0200 [thread overview]
Message-ID: <87shqy2l4v.fsf@intel.com> (raw)
In-Reply-To: <20161111132131.25403-1-daniel.vetter@ffwll.ch>
On Fri, 11 Nov 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Joonas rightly complained that the current output is useless and just
> confuses.
>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-11-11 13:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-11 13:21 [PATCH] dim: Improve the error output when rebuild-nightly fails Daniel Vetter
2016-11-11 13:37 ` Jani Nikula [this message]
2016-11-11 16:10 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87shqy2l4v.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox