Fix incorrect reflog entry on rebase

Michelle Tilley · Michelle Tilley · commit a2cc118ae237 · 2016-09-12T12:17:31.000-07:00
diff --git a/js/historyview.js b/js/historyview.js
@@ -1475,7 +1475,7 @@ define(['d3'], function() {
               this.reset(origBranch)
               this._setCurrentBranch(origBranch)
               this.addReflogEntry(
-                'HEAD', targetCommit.id, 'rebase finished: returning to resf/heads/' + origBranch
+                'HEAD', this.getCommit('HEAD').id, 'rebase finished: returning to resf/heads/' + origBranch
               )
               this.addReflogEntry(
                 origBranch, newHeadCommit.id, 'rebase finished: refs/heads/' +

Original file line number	Diff line number	Diff line change
`@@ -1475,7 +1475,7 @@ define(['d3'], function() {`
`1475`	`1475`	`this.reset(origBranch)`
`1476`	`1476`	`this._setCurrentBranch(origBranch)`
`1477`	`1477`	`this.addReflogEntry(`
`1478`		`- 'HEAD', targetCommit.id, 'rebase finished: returning to resf/heads/' + origBranch`
	`1478`	`+ 'HEAD', this.getCommit('HEAD').id, 'rebase finished: returning to resf/heads/' + origBranch`
`1479`	`1479`	`)`
`1480`	`1480`	`this.addReflogEntry(`
`1481`	`1481`	`origBranch, newHeadCommit.id, 'rebase finished: refs/heads/' +`