Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit ff5fb6c

Browse files
author
Tilde Ann Thurium
authored
Merge pull request #1464 from atom/tt-18-may-load-users-bug
stop calling `repository.didUpdate` when commit message changes.
2 parents df5ef8c + df549ba commit ff5fb6c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

lib/models/repository-states/present.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ export default class Present extends State {
4545
}
4646

4747
setCommitMessage(message) {
48-
const oldMessage = this.commitMessage;
4948
this.commitMessage = message;
50-
if (oldMessage !== message) {
51-
this.didUpdate();
52-
}
5349
}
5450

5551
getCommitMessage() {

test/controllers/commit-controller.test.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@ describe('CommitController', function() {
8787
assert.strictEqual(wrapper.find('CommitView').prop('message'), 'some message');
8888
});
8989

90+
it('does not cause the repository to update when commit message changes', function() {
91+
repository.setCommitMessage('some message');
92+
const wrapper = shallow(app, {disableLifecycleMethods: true}).instance();
93+
sinon.spy(wrapper.props.repository.state, 'didUpdate');
94+
assert.strictEqual(wrapper.getCommitMessage(), 'some message');
95+
wrapper.handleMessageChange('new message');
96+
assert.strictEqual(wrapper.getCommitMessage(), 'new message');
97+
assert.isFalse(wrapper.props.repository.state.didUpdate.called);
98+
});
99+
90100
describe('when a merge message is defined', function() {
91101
it('is set to the merge message when merging', function() {
92102
app = React.cloneElement(app, {isMerging: true, mergeMessage: 'merge conflict!'});

0 commit comments

Comments
 (0)