summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-11-16 17:37:44 (GMT)
committerPaul Mackerras <paulus@samba.org>2013-12-01 22:24:20 (GMT)
commitce2c58cdaad42b9af6ad243f149c542ea93f8d01 (patch)
tree958397c233c9cafe1a08f54c6e830c547754dcf7 /gitk
parent9403bd02dd96a2f8b1a5802d86e1592d0dcf2358 (diff)
downloadgit-ce2c58cdaad42b9af6ad243f149c542ea93f8d01.zip
git-ce2c58cdaad42b9af6ad243f149c542ea93f8d01.tar.gz
git-ce2c58cdaad42b9af6ad243f149c542ea93f8d01.tar.bz2
gitk: Recognize -L option
This gives line-log support to gitk, by exploiting the new support for processing and showing "inline" diffs straight from the git-log output. Note that we 'set allknown 0', which is a bit counterintuitive since this is a "known" option. But that flag prevents gitk from thinking it can optimize the view by running rev-list to see the topology; in the -L case that doesn't work. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk8
1 files changed, 8 insertions, 0 deletions
diff --git a/gitk b/gitk
index 1f5bc73..33c3a6c 100755
--- a/gitk
+++ b/gitk
@@ -235,6 +235,14 @@ proc parseviewargs {n arglist} {
set filtered 1
lappend glflags $arg
}
+ "-L*" {
+ # Line-log with 'stuck' argument (unstuck form is
+ # not supported)
+ set filtered 1
+ set vinlinediff($n) 1
+ set allknown 0
+ lappend glflags $arg
+ }
"-n" {
# This appears to be the only one that has a value as a
# separate word following it