Open
Description
Using:
v530 on cygwin
v458 on centos/sles (yay, enterprise distros :( )
.gitconfig snippage
pager.core = less -IqRFX
pager.diff = less -IqRFX --pattern='^diff --git'
With a small git diff, --pattern overrides the -F so the screen is filled with tildes (or newlines if -~ is used) and the top line(s) scroll(s) off the screen. Did some fiddling with -a and prepending @, ^K to the pattern but no change in the unintended behaviour.
Hack that fixes it in the diff, but it would be better to fix it in less itself, especially since this hack breaks less from working with a "larger than a screenfull" change, which is the use case for less in the first place...
Output with pager.diff UNset:
total 212,992
drwxr-xr-x+ 1 Scooby None 0 Oct 14 15:47 ./
drwxr-xr-x+ 1 Scooby None 0 Oct 14 15:46 ../
drwxr-xr-x+ 1 Scooby None 0 Aug 13 2016 hooks/
drwxr-xr-x+ 1 Scooby None 0 Sep 6 18:31 info/
drwxr-xr-x+ 1 Scooby None 0 Sep 6 18:31 logs/
drwxr-xr-x+ 1 Scooby None 0 Oct 14 15:27 objects/
drwxr-xr-x+ 1 Scooby None 0 Oct 14 13:08 refs/
drwxr-xr-x+ 1 Scooby None 0 Aug 17 2016 rr-cache/
-rw-rw-r-- 1 Scooby None 31 Aug 1 2016 ADD_EDIT.patch
-rw-rw-r-- 1 Scooby None 8,078 Aug 1 2016 ADD_EDIT.patch~
-rw-r--r-- 1 Scooby None 1,094 Oct 14 13:16 addp-hunk-edit.diff~
-rw-rw-r-- 1 Scooby None 36 Oct 14 15:27 COMMIT_EDITMSG
-rw-r--r-- 1 Scooby None 695 Oct 14 13:07 COMMIT_EDITMSG~
-rw-rw-r-- 1 Scooby None 171 Oct 14 14:55 config
-rw-r--r-- 1 Scooby None 200 Oct 14 14:54 config~
-rw-rw-r-- 1 Scooby None 73 Jul 26 2016 description
-rw-rw-r-- 1 Scooby None 0 Sep 6 18:17 FETCH_HEAD
-rw-rw-r-- 1 Scooby None 22,359 Sep 4 14:39 gitk.cache
-rw-r--r-- 1 Scooby None 23 Oct 14 13:07 HEAD
-rw-r--r-- 1 Scooby None 70,358 Oct 14 15:27 index
-rw-r--r-- 1 Scooby None 0 Oct 14 15:27 MERGE_RR
-rw-r--r-- 1 Scooby None 41 Oct 14 13:15 ORIG_HEAD
-rw-rw-r-- 1 Scooby None 105 Sep 6 18:31 packed-refs
Scooby@M6800:~/ master
$ gd .gitconfig
diff --git i/.gitconfig w/.gitconfig
index defb44e..3713888 100644
--- i/.gitconfig
+++ w/.gitconfig
@@ -12,6 +12,11 @@
mergeoptions = --no-ff
sshCommand = ssh -o VisualHostKey=no
+[pager]
+ # hack to fix less filling and scrolling the page with tildes when --pattern is specified
+# diff = less -IqRFX --pattern='^diff --git' | sed 's/^~\\n//g'
+# diff = less -IqRFX --pattern='^diff --git'
+
[branch]
autosetupmerge = true
Scooby@M6800:~/ master
$
Output with pager.diff set:
index defb44e..f6f4d0c 100644
--- i/.gitconfig
+++ w/.gitconfig
@@ -12,6 +12,11 @@
mergeoptions = --no-ff
sshCommand = ssh -o VisualHostKey=no
+[pager]
+# hack to fix less filling and scrolling the page with tildes when --pattern is specified
+# diff = less -IqRFX --pattern='^diff --git' | sed 's/^~\\n//g'
+ diff = less -IqRFX --pattern='^diff --git'
+
[branch]
autosetupmerge = true
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
Scooby@M6800:~/ master
$
Metadata
Metadata
Assignees
Labels
No labels