From e90478511d68cb8a0d8e5dea9c3629e7f0091f8c Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Fri, 20 Nov 2020 22:08:52 -0800
Subject: [PATCH] Restore correct cursor position in commit buffer

Use `lockmarks` in fugitive#BufReadCmd to avoid offsetting marks.
---
 autoload/fugitive.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index ad6b137..7edec5d 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -2159,13 +2159,13 @@ function! fugitive#BufReadCmd(...) abort
           keepjumps 1
           keepjumps call search('^parent ')
           if getline('.') ==# 'parent '
-            silent keepjumps delete_
+            silent lockmarks keepjumps delete_
           else
             silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps s/\m\C\%(^parent\)\@<! /\rparent /e' . (&gdefault ? '' : 'g')
           endif
           keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
           if lnum
-            silent keepjumps delete_
+            silent lockmarks keepjumps delete_
           end
           silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps 1,/^diff --git\|\%$/s/\r$//e'
           keepjumps 1