Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-17 13:37:18 +03:00
Code Issues Projects Releases Wiki Activity

restore if hard reset

Browse Source
This commit is contained in:
Martin Marmsoler 2023-02-07 19:37:54 +01:00
parent 48b5e85dc5
commit cae0ff2235
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/git/Commit.cpp
View File

@ -271,7 +271,8 @@ bool Commit::reset(git_reset_t type, const QStringList &paths) const {
Repository repo = this->repo();
int state = repo.state();
int error = git_reset(repo, d.data(), type, &opts);
emit repo.notifier()->referenceUpdated(repo.head(), true);
emit repo.notifier()->referenceUpdated(repo.head(),
type == git_reset_t::GIT_RESET_HARD);
if (repo.state() != state) {
Patch::clearConflictResolutions(repo);
emit repo.notifier()->stateChanged();