diff options
| author | Daniel Hahler <github@thequod.de> | 2017-06-11 16:25:13 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-06-11 16:25:13 +0200 |
| commit | 6eb2bcd1a02872433871cc53f525e90dc03fe4dd (patch) | |
| tree | f69eeb6ab0850455419116cd7f4664021533b600 | |
| parent | 9f534f338adf4a56d17555dc5b2c02e9935f81cb (diff) | |
| download | rneovim-6eb2bcd1a02872433871cc53f525e90dc03fe4dd.tar.gz rneovim-6eb2bcd1a02872433871cc53f525e90dc03fe4dd.tar.bz2 rneovim-6eb2bcd1a02872433871cc53f525e90dc03fe4dd.zip | |
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).
| -rwxr-xr-x | scripts/vim-patch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |