summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-14 14:37:15 -0500
committerStan Hu <stanhu@gmail.com>2019-05-15 21:34:59 -0700
commit5632079c3684562aea890123182bd43648149b55 (patch)
tree327406be44c1893447da6d486ac816a11b80b23a /bin
parent3d2edaac04ec1e4d5074a43249c11cf6e8a8eecf (diff)
downloadgitlab-ce-sh-fix-rebase-error-clearing.tar.gz
Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearing
If `merge_error` is ever set after a failure, it is never cleared, even after a subsequent, successful rebase. We now clear this field whenever a successful rebase occurs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions