Unstaged files are reverted on a commit

[jimwebb]

I'm running Revisr 1.8.1 on WP 4.0.1, git 1.9.3 on CentOS.

Observed behavior: If a file is unstaged in Revisr, and a commit made to other (staged) files, the unstaged files are reverted to an earlier version. Changes made to the unstaged files are lost.

Expected behavior: Files that are unstaged should remain as they are on disk when the commit happens.

To reproduce:

• In a clean working directory, edit two files, A and B.
• Click "commit", enter a commit message.
• Unstage B. Leave A staged.
• Make the commit.
• Check the files on disk; the staged/committed file A retains the changes, as expected; the unstaged file B reverts to the state before the files were edited, and changes to the unstaged file are lost.

Thanks.

[jimwebb]

Hey! Turns out this only happens if you're automatically pushing to a remote repo (Settings > Remote). When that's the case, it looks like revisr is calling "git reset --hard HEAD" after adding the staged files.

[expandedfronts]

Hi Jim,

Thanks for the heads up and detailed report on the issue. That reset was added back in an older version when the workflow was a lot different/more limited (before v1.5). That's why you see the message ("Are you sure you want to discard any uncommitted changes and push to the remote?") when pushing manually.

That reset should no longer be needed so I've removed it on the develop branch and will add the fix in the next release. Thanks again!

[expandedfronts]

Hello,

This has been corrected in the latest release. Please let me know if you run into any further issues. Thanks!