Fix a bug in reset

pvigier · pvigier · commit 7d966602aadf · 2019-03-04T10:36:46.000+01:00
diff --git a/src/renderer/helpers/repo-state.ts b/src/renderer/helpers/repo-state.ts
@@ -317,7 +317,12 @@ export class RepoState {
   }
 
   async reset(target: Git.Commit, resetType: Git.Reset.TYPE) {
-    Git.Reset.reset(this.repo, target, resetType, {});
+    try {
+      const commit = await this.repo.getCommit(target); // We need to reload the commit otherwise "Repository and target commit's repository does not match" is thrown
+      await Git.Reset.reset(this.repo, commit, resetType, {});
+    } catch(e) {
+      this.onNotification(`Unable to reset to ${target.sha()}: ${e.message}`, NotificationType.Error);
+    }
   }
 
   // Index operations

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,12 @@ export class RepoState {`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`async reset(target: Git.Commit, resetType: Git.Reset.TYPE) {`
`320`		`- Git.Reset.reset(this.repo, target, resetType, {});`
	`320`	`+ try {`
	`321`	`+ const commit = await this.repo.getCommit(target); // We need to reload the commit otherwise "Repository and target commit's repository does not match" is thrown`
	`322`	`+ await Git.Reset.reset(this.repo, commit, resetType, {});`
	`323`	`+ } catch(e) {`
	`324`	+ this.onNotification(`Unable to reset to ${target.sha()}: ${e.message}`, NotificationType.Error);
	`325`	`+ }`
`321`	`326`	`}`
`322`	`327`
`323`	`328`	`// Index operations`