From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Pratyush Yadav <me@yadavpratyush.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v3 1/2] git-gui: use existing interface to query a path's attribute
Date: Tue, 1 Oct 2019 17:22:57 +0200 [thread overview]
Message-ID: <CAKPyHN2qSudnEMfokp5-BXBDU6_kcVv3aokNUYdqZOnMXYVzYw@mail.gmail.com> (raw)
In-Reply-To: <20191001142401.hhg5dtefj6qg66dd@yadavpratyush.com>
On Tue, Oct 1, 2019 at 4:24 PM Pratyush Yadav <me@yadavpratyush.com> wrote:
>
> Hi,
>
> I don't see any difference between v3 and v2 of this patch. What changed
> in this version?
nothing, but 2/2 changed.
Bert
>
> On 30/09/19 09:54PM, Bert Wesarg wrote:
> > Replace the hand-coded call to git check-attr with the already provided one.
> >
> > Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
> > ---
> > lib/diff.tcl | 15 +--------------
> > 1 file changed, 1 insertion(+), 14 deletions(-)
> >
> > diff --git a/lib/diff.tcl b/lib/diff.tcl
> > index 958a0fa..0fd4600 100644
> > --- a/lib/diff.tcl
> > +++ b/lib/diff.tcl
> > @@ -270,19 +270,6 @@ proc show_other_diff {path w m cont_info} {
> > }
> > }
> >
> > -proc get_conflict_marker_size {path} {
> > - set size 7
> > - catch {
> > - set fd_rc [eval [list git_read check-attr "conflict-marker-size" -- $path]]
> > - set ret [gets $fd_rc line]
> > - close $fd_rc
> > - if {$ret > 0} {
> > - regexp {.*: conflict-marker-size: (\d+)$} $line line size
> > - }
> > - }
> > - return $size
> > -}
> > -
> > proc start_show_diff {cont_info {add_opts {}}} {
> > global file_states file_lists
> > global is_3way_diff is_submodule_diff diff_active repo_config
> > @@ -298,7 +285,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
> > set is_submodule_diff 0
> > set diff_active 1
> > set current_diff_header {}
> > - set conflict_size [get_conflict_marker_size $path]
> > + set conflict_size [gitattr $path conflict-marker-size 7]
> >
> > set cmd [list]
> > if {$w eq $ui_index} {
> > --
> > 2.23.0.11.g242cf7f110
> >
>
> --
> Regards,
> Pratyush Yadav
next prev parent reply other threads:[~2019-10-01 15:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 20:38 [PATCH 1/2] git-gui: use existing interface to query a path's attribute Bert Wesarg
2019-09-25 20:38 ` [PATCH 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2019-09-29 15:04 ` Pratyush Yadav
2019-09-30 12:17 ` Bert Wesarg
2019-09-30 12:20 ` [PATCH v2 1/2] git-gui: use existing interface to query a path's attribute Bert Wesarg
2019-09-30 12:20 ` [PATCH v2 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2019-09-30 19:54 ` [PATCH v3 1/2] git-gui: use existing interface to query a path's attribute Bert Wesarg
2019-10-01 14:24 ` Pratyush Yadav
2019-10-01 15:22 ` Bert Wesarg [this message]
2019-10-01 17:31 ` Pratyush Yadav
2019-10-02 7:35 ` Bert Wesarg
2019-10-02 7:36 ` [PATCH v3 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2019-10-02 23:54 ` Pratyush Yadav
2019-10-03 20:02 ` [PATCH " Philip Oakley
2019-10-03 20:54 ` Pratyush Yadav
2019-10-03 21:40 ` Philip Oakley
[not found] ` <CAKPyHN0_AUqLpPVDNJUZqNV8zRQzaDOMXJV4AbnK969AdtGpNg@mail.gmail.com>
2019-10-04 16:09 ` Philip Oakley
2019-09-27 5:27 ` [PATCH 1/2] git-gui: use existing interface to query a path's attribute Pratyush Yadav
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKPyHN2qSudnEMfokp5-BXBDU6_kcVv3aokNUYdqZOnMXYVzYw@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=me@yadavpratyush.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).