From 6eb2bcd1a02872433871cc53f525e90dc03fe4dd Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 11 Jun 2017 16:25:13 +0200 Subject: scripts/vim-patch.sh: do not git-reset on push failure (#6878) This was added from the beginning to submit_pr in 775a16b0b, but I cannot see why that is useful - in contrast, it will mess with the local branch in case "origin" cannot be pushed to (i.e. when it points to neovim/neovim itself). --- scripts/vim-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 3b083e7b83..63665b9253 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -280,7 +280,7 @@ submit_pr() { echo "Pushing to 'origin/${checked_out_branch}'." output="$(git push origin "${checked_out_branch}" 2>&1)" && echo "✔ ${output}" || - (echo "✘ ${output}"; git reset --soft HEAD^1; false) + (echo "✘ ${output}"; false) echo fi -- cgit