Fixed "unbranched" stash message support:

costa · jcouball · commit 2e79dbe657ae · 2024-10-23T08:50:03.000-07:00
- the tests are generously provided by James Couball &lt;jcouball@yahoo.com&gt;
- more proper stash metadata parsing introduced
  - supporting both "branched" ("On &lt;BRANCH&gt;: ...") and "unbranched" messages
  - which might affect the future 3.x behaviour wrt "un/branched" stashes
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -1134,8 +1134,10 @@ def stashes_all
       if File.exist?(filename)
         File.open(filename) do |f|
           f.each_with_index do |line, i|
-            m = line.match(/:(.*)$/)
-            arr << [i, m[1].strip]
+            _, msg = line.split("\t")
+            # NOTE this logic may be removed/changed in 3.x
+            m = msg.match(/^[^:]+:(.*)$/)
+            arr << [i, (m ? m[1] : msg).strip]
           end
         end
       end
diff --git a/tests/units/test_stashes.rb b/tests/units/test_stashes.rb
@@ -44,4 +44,107 @@ def test_stashes_all
       assert(stashes[0].include?('testing-stash-all'))
     end
   end
+  test 'Git::Lib#stashes_all' do
+    in_bare_repo_clone do |g|
+      assert_equal(0, g.branch.stashes.size)
+      new_file('test-file1', 'blahblahblah1')
+      new_file('test-file2', 'blahblahblah2')
+      assert(g.status.untracked.assoc('test-file1'))
+
+      g.add
+
+      assert(g.status.added.assoc('test-file1'))
+
+      g.branch.stashes.save('testing-stash-all')
+
+      # puts `cat .git/logs/refs/stash`
+      # 0000000000000000000000000000000000000000 b9b008cd179b0e8c4b8cda35bac43f7011a0836a James Couball <jcouball@yahoo.com> 1729463252 -0700   On master: testing-stash-all
+
+      stashes = assert_nothing_raised { g.lib.stashes_all }
+
+      expected_stashes = [
+        [0, 'testing-stash-all']
+      ]
+
+      assert_equal(expected_stashes, stashes)
+    end
+  end
+
+  test 'Git::Lib#stashes_all - stash message has colon' do
+    in_bare_repo_clone do |g|
+      assert_equal(0, g.branch.stashes.size)
+      new_file('test-file1', 'blahblahblah1')
+      new_file('test-file2', 'blahblahblah2')
+      assert(g.status.untracked.assoc('test-file1'))
+
+      g.add
+
+      assert(g.status.added.assoc('test-file1'))
+
+      g.branch.stashes.save('saving: testing-stash-all')
+
+      # puts `cat .git/logs/refs/stash`
+      # 0000000000000000000000000000000000000000 b9b008cd179b0e8c4b8cda35bac43f7011a0836a James Couball <jcouball@yahoo.com> 1729463252 -0700   On master: saving: testing-stash-all
+
+      stashes = assert_nothing_raised { g.lib.stashes_all }
+
+      expected_stashes = [
+        [0, 'saving: testing-stash-all']
+      ]
+
+      assert_equal(expected_stashes, stashes)
+    end
+  end
+
+  test 'Git::Lib#stashes_all -- git stash message with no branch and no colon' do
+    in_temp_dir do
+      `git init`
+      `echo "hello world" > file1.txt`
+      `git add file1.txt`
+      `git commit -m "First commit"`
+      `echo "update" > file1.txt`
+      commit = `git stash create "stash message"`.chomp
+      # Create a stash with this message: 'custom message'
+      `git stash store -m "custom message" #{commit}`
+
+      # puts `cat .git/logs/refs/stash`
+      # 0000000000000000000000000000000000000000 0550a54ed781eda364ca3c22fcc46c37acae4bd6 James Couball <jcouball@yahoo.com> 1729460302 -0700   custom message
+
+      git = Git.open('.')
+
+      stashes = assert_nothing_raised { git.lib.stashes_all }
+
+      expected_stashes = [
+        [0, 'custom message']
+      ]
+
+      assert_equal(expected_stashes, stashes)
+    end
+  end
+
+  test 'Git::Lib#stashes_all -- git stash message with no branch and explicit colon' do
+    in_temp_dir do
+      `git init`
+      `echo "hello world" > file1.txt`
+      `git add file1.txt`
+      `git commit -m "First commit"`
+      `echo "update" > file1.txt`
+      commit = `git stash create "stash message"`.chomp
+      # Create a stash with this message: 'custom message'
+      `git stash store -m "testing: custom message" #{commit}`
+
+      # puts `cat .git/logs/refs/stash`
+      # 0000000000000000000000000000000000000000 eadd7858e53ea4fb8b1383d69cade1806d948867 James Couball <jcouball@yahoo.com> 1729462039 -0700   testing: custom message
+
+      git = Git.open('.')
+
+      stashes = assert_nothing_raised { git.lib.stashes_all }
+
+      expected_stashes = [
+        [0, 'custom message']
+      ]
+
+      assert_equal(expected_stashes, stashes)
+    end
+  end
 end
