Unset local config values when empty

Author: smashwilson

lib/controllers/git-tab-controller.js

@@ -375,8 +375,17 @@ export default class GitTabController extends React.Component {
     const newUsername = this.usernameBuffer.getText();
     const newEmail = this.emailBuffer.getText();
 
-    await this.props.repository.setConfig('user.name', newUsername, options);
-    await this.props.repository.setConfig('user.email', newEmail, options);
+    if (newUsername.length > 0) {
+      await this.props.repository.setConfig('user.name', newUsername, options);
+    } else {
+      await this.props.repository.unsetConfig('user.name');
+    }
+
+    if (newEmail.length > 0) {
+      await this.props.repository.setConfig('user.email', newEmail, options);
+    } else {
+      await this.props.repository.unsetConfig('user.email');
+    }
     this.closeIdentityEditor();
   }
 

test/controllers/git-tab-controller.test.js

@@ -260,6 +260,21 @@ describe('GitTabController', function() {
       assert.isTrue(setConfig.calledWith('user.name', 'changed', {global: true}));
       assert.isTrue(setConfig.calledWith('user.email', '[email protected]', {global: true}));
     });
+
+    it('unsets config values when empty', async function() {
+      const repository = await buildRepository(await cloneRepository('three-files'));
+      const unsetConfig = sinon.stub(repository, 'unsetConfig');
+
+      const wrapper = mount(await buildApp(repository));
+
+      wrapper.find('GitTabView').prop('usernameBuffer').setText('');
+      wrapper.find('GitTabView').prop('emailBuffer').setText('');
+
+      await wrapper.find('GitTabView').prop('setLocalIdentity')();
+
+      assert.isTrue(unsetConfig.calledWith('user.name'));
+      assert.isTrue(unsetConfig.calledWith('user.email'));
+    });
   });
 
   describe('abortMerge()', function() {