Changes to compareWithHead and compareWithWorking. Closes #1592.

[tamuratak]

Description

Changes to compareWithHead and compareWithWorking. Closes #1592.

Checklist

• [x] I have followed the guidelines in the Contributing document
• [x] My changes follow the coding style of this project
• [x] My changes build without any errors or warnings
• [x] My changes have been formatted and linted
• [x] My changes include any required corresponding changes to the documentation
• [x] My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
• [x] My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses