git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] gitk: fix --all behavior combined with --not

From
Heiko Voigt <hvoigt@hvoigt.net>
Date
Jul 4, 2019, 08:09 UTC
Message-ID
<20190704080907.GA45656@book.hvoigt.net>

In commit 4d5e1b1319 ("gitk: Show detached HEAD if --all is specified", 2014-09-09) the intention was to have detached HEAD shown when the --all argument is given.

This was solved by appending HEAD to the revs list. By doing that the behavior using the --not argument is now broken, since that inverts the meaning of all following arguments passed to git rev-parse.

Lets fix this by prepending HEAD instead of appending, this way there can not be any '--not' in front.

This was discovered because
	gitk --all --not origin/master
does not display the same revs as
	gitk --all ^origin/master
which it should.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk b/gitk
index a14d7a1..19d95cd 100755
--- a/gitk
+++ b/gitk
@@ -295,7 +295,7 @@ proc parseviewrevs {view revs} {
     if {$revs eq {}} {
 	set revs HEAD
     } elseif {[lsearch -exact $revs --all] >= 0} {
-	lappend revs HEAD
+	linsert revs 0 HEAD
     }
     if {[catch {set ids [eval exec git rev-parse $revs]} err]} {
 	# we get stdout followed by stderr in $err
-- 
2.21.0
Next: Johannes Schindelin
Message 1 of 12 in “gitk: fix --all behavior combined with --not”
  1. gitk: fix --all behavior combined with --notHeiko Voigt, Jul 4, 2019
  2. Johannes SchindelinJul 4, 2019
  3. Heiko VoigtJul 4, 2019
  4. Junio C HamanoJul 8, 2019
  5. Junio C HamanoJul 9, 2019
  6. Junio C HamanoJul 9, 2019
  7. Heiko VoigtJul 10, 2019
  8. Junio C HamanoJul 10, 2019
  9. Heiko VoigtJul 11, 2019
  10. Junio C HamanoJul 11, 2019
  11. Johannes SixtJul 11, 2019
  12. Heiko VoigtJul 10, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.