From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Scott Batchelor <scott.batchelor@gmail.com>,
Paul Mackerras <paulus@samba.org>,
git@vger.kernel.org
Subject: Re: [PATCH] gitk: refresh the index before running diff-files
Date: Fri, 28 Sep 2012 14:40:46 -0700 [thread overview]
Message-ID: <7vmx09keqp.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120928205054.GA5985@sigill.intra.peff.net> (Jeff King's message of "Fri, 28 Sep 2012 16:50:54 -0400")
Jeff King <peff@peff.net> writes:
> Potentially the "reload" command should reset the need_index_refresh
> flag, too.
Yeah, I think that is a sane enhancement to think about.
> gitk | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/gitk b/gitk
> index 379582a..561be23 100755
> --- a/gitk
> +++ b/gitk
> @@ -5112,6 +5112,14 @@ proc dodiffindex {} {
> filerun $fd [list readdiffindex $fd $lserial $i]
> }
>
> +proc refresh_index {} {
> + global need_index_refresh
> + if { $need_index_refresh } {
> + exec sh -c "git update-index --refresh >/dev/null 2>&1 || true"
> + set need_index_refresh false
> + }
> +}
> +
> proc readdiffindex {fd serial inst} {
> global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
> global vfilelimit
> @@ -5131,6 +5139,7 @@ proc readdiffindex {fd serial inst} {
> }
>
> # now see if there are any local changes not checked in to the index
> + refresh_index
> set cmd "|git diff-files"
> if {$vfilelimit($curview) ne {}} {
> set cmd [concat $cmd -- $vfilelimit($curview)]
> @@ -11670,6 +11679,7 @@ set want_ttk 1
> set autosellen 40
> set perfile_attrs 0
> set want_ttk 1
> +set need_index_refresh true
>
> if {[tk windowingsystem] eq "aqua"} {
> set extdifftool "opendiff"
next prev parent reply other threads:[~2012-09-28 21:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 18:55 Git diff-file bug? Scott Batchelor
2012-09-28 20:23 ` Jeff King
2012-09-28 20:50 ` [PATCH] gitk: refresh the index before running diff-files Jeff King
2012-09-28 21:40 ` Junio C Hamano [this message]
2012-09-28 22:11 ` Andreas Schwab
2012-09-28 22:31 ` Jeff King
2012-09-28 23:02 ` Junio C Hamano
2012-09-28 23:04 ` Jeff King
2012-09-28 23:18 ` Junio C Hamano
2012-09-28 23:20 ` Andreas Schwab
2012-09-30 0:05 ` Paul Mackerras
2012-09-30 1:42 ` Jeff King
2012-09-30 20:34 ` Jonathan Nieder
2012-10-01 22:32 ` Jeff King
2012-10-01 22:54 ` Junio C Hamano
2012-09-28 20:40 ` Git diff-file bug? Junio C Hamano
2012-10-03 8:04 ` Scott Batchelor
2012-10-03 11:58 ` Drew Northup
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=7vmx09keqp.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
--cc=peff@peff.net \
--cc=scott.batchelor@gmail.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).