Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753406AbdFVPvf (ORCPT ); Thu, 22 Jun 2017 11:51:35 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36440 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751224AbdFVPvd (ORCPT ); Thu, 22 Jun 2017 11:51:33 -0400 Subject: Re: [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header To: Geert Uytterhoeven , Rob Herring References: <1498136826-6793-1-git-send-email-geert+renesas@glider.be> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org From: Frank Rowand Message-ID: <594BE781.5050407@gmail.com> Date: Thu, 22 Jun 2017 08:51:29 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1498136826-6793-1-git-send-email-geert+renesas@glider.be> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1483 Lines: 44 On 06/22/17 06:07, Geert Uytterhoeven wrote: > As the comparison uses process substitution to pass files after > conversion to DTS format, the diff header doesn't show the real > filenames, but the names of the file descriptors used: > > --- /dev/fd/63 2017-06-22 11:21:47.531637188 +0200 > +++ /dev/fd/62 2017-06-22 11:21:47.531637188 +0200 > > This is especially annoying when comparing a bunch of DT files in a > loop, as the output doesn't show a clue about which files it refers to. > > Fix this by explicitly passing the original file names to the diff > command using the --label option, giving e.g.: > > --- arch/arm/boot/dts/r8a7791-koelsch.dtb > +++ arch/arm/boot/dts/r8a7791-porter.dtb > > Signed-off-by: Geert Uytterhoeven > --- > scripts/dtc/dtx_diff | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff > index ec47f95991a3aecc..fb86f3899e162200 100755 > --- a/scripts/dtc/dtx_diff > +++ b/scripts/dtc/dtx_diff > @@ -338,7 +338,7 @@ DTC="${DTC} ${dtc_flags} -O dts -qq -f ${dtc_sort} -o -" > > if (( ${cmd_diff} )) ; then > > - diff ${diff_flags} \ > + diff ${diff_flags} --label "${dtx_file_1}" --label "${dtx_file_2}" \ > <(compile_to_dts "${dtx_file_1}") \ > <(compile_to_dts "${dtx_file_2}") > > Reviewed-by: Frank Rowand Thanks Geert! It may look like a small change, but it is a big usability win. -Frank