Please pull gitk master branch

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Please pull gitk master branch

From: Paul Mackerras <hidden>
Date: 2016-06-15 22:46:58

Junio,

Please do a pull from my gitk repository master branch to get the
following commits:

Christian Stimming (1):
      gitk: Update German translation.

Dirk Suesserott (1):
      gitk: Add option 'Simple history' to the options menu

Elijah Newren (1):
      gitk: Make more options easily accessible from Edit View dialog

Johannes Sixt (1):
      gitk: Use --textconv to generate diff text

Markus Heidelberg (1):
      gitk: Allow diff view without context lines

Michele Ballabio (1):
      gitk: Add another string to translation

Pat Thoyts (1):
      gitk: Handle msysGit version during version comparisons

Paul Mackerras (1):
      gitk: Check git version before using --textconv flag

Thanks,
Paul.

[PATCH] gitk: disable checkout of remote branch

From: Sitaram Chamarty <hidden>
Date: 2016-06-15 22:46:58

At the command line, this gives you a detailed warning message, but the
GUI currently allows it without any fuss.

Since the GUI is often used by people much less familiar with git, it
seems reasonable to make the GUI more restrictive than the command line,
not less.

This prevents a lot of detached HEAD commits by new users.

Signed-off-by: Sitaram Chamarty <redacted>
---

Paul,

[Due to a quirk in how I access this list, the "cc" to you
will come from my work address, not my public gmail address
that the list sees.  Sigh...]

I sent this to the list some time ago, and later someone
helpfully suggested I should copy you.  Not wanting to send
it to the list twice, I sent that only to you, but it
probably got lost.

Could you please approve and include this in your repo?
This patch helps me a lot.

Naturally, if you think it's bad, I'd appreciate hearing
criticism.

Thanks and best regards,

Sitaram

 gitk-git/gitk |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 gitk-git/gitk
diff --git a/gitk-git/gitk b/gitk-git/gitk
old mode 100644
new mode 100755
index 8c66d17..411bc52
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -8770,6 +8770,9 @@ proc headmenu {x y id head} {
     set headmenuid $id
     set headmenuhead $head
     set state normal
+    if {[string match "remotes/*" $head]} {
+	set state disabled
+    }
     if {$head eq $mainhead} {
 	set state disabled
     }
-- 
1.6.3.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help