fixed bug that caused merge not to apply uncommitted saved changes

Author: spderosso

gitless/cli/gl_commit.py

@@ -68,7 +68,7 @@ def _op_continue(op, fn):
   pprint.blank()
   try:
     op(op_cb=pprint.OP_CB)
-    pprint.ok('{0} succeeded'.format(op))
+    pprint.ok('{0} succeeded'.format(fn))
   except core.ApplyFailedError as e:
-    pprint.ok('{0} succeeded'.format(op))
+    pprint.ok('{0} succeeded'.format(fn))
     raise e

gitless/core.py

@@ -792,7 +792,7 @@ def merge(self, src, op_cb=None):
         raise GlError(stdout(e) + err)
       if op_cb and op_cb.save:
         op_cb.save()
-      git.stash.save('--', _stash_msg_merge)
+      git.stash.save('--', _stash_msg_merge(self))
       try:
         git.merge(src, '--no-ff')
       except ErrorReturnCode as e:

gitless/tests/test_e2e.py

@@ -604,6 +604,26 @@ def test_uncommitted_changes(self):
     self.assertEqual('uncommitted', utils.read_file(self.MASTER_FILE))
     self.assertEqual('uncommitted', utils.read_file('master_untracked'))
 
+  def test_uncommitted_tracked_changes_that_conflict(self):
+    gl.branch(c='tmp', divergent_point='HEAD~1')
+    gl.switch('tmp')
+    utils.write_file(self.MASTER_FILE, contents='uncommitted')
+    self.assertRaisesRegexp(
+        ErrorReturnCode, 'failed to apply', gl.merge, 'master')
+    contents = utils.read_file(self.MASTER_FILE)
+    self.assertTrue('uncommitted' in contents)
+    self.assertTrue('contents 2' in contents)
+
+  def test_uncommitted_tracked_changes_that_conflict_append(self):
+    gl.branch(c='tmp', divergent_point='HEAD~1')
+    gl.switch('tmp')
+    utils.append_to_file(self.MASTER_FILE, contents='uncommitted')
+    self.assertRaisesRegexp(
+        ErrorReturnCode, 'failed to apply', gl.merge, 'master')
+    contents = utils.read_file(self.MASTER_FILE)
+    self.assertTrue('uncommitted' in contents)
+    self.assertTrue('contents 2' in contents)
+
 
 class TestPerformance(TestEndToEnd):