A simple series to fix restore_state() in builtin/merge.c, fixing the issue reported by ZheNing Hu over here: https://lore.kernel.org/git/CAOLTT8R7QmpvaFPTRs3xTpxr7eiuxF-ZWtvUUSC0-JOo9Y+SqA@xxxxxxxxxxxxxx/ Elijah Newren (2): merge: remove unused variable merge: make restore_state() do as its name says builtin/merge.c | 12 ++++++------ t/t7607-merge-state.sh | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100755 t/t7607-merge-state.sh base-commit: 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1231%2Fnewren%2Ffix-merge-restore-state-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1231/newren/fix-merge-restore-state-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1231 -- gitgitgadget
