completions/git: Some rewordings

These are the longest subcommand descriptions, so it gives us more space

(cherry picked from commit 21f1eebd01)

CHANGELOG.rst

@@ -1,4 +1,4 @@
-fish 3.7.0 (released ???)
+fish 3.6.1 (released ???)
 ===================================
 
 .. ignore: 9439 9440 9442 9452 9469 9480 9482

share/completions/git.fish

@@ -1127,7 +1127,7 @@ complete -f -c git -n '__fish_git_using_command archive' -l worktree-attributes
 # TODO options
 
 ### bisect
-complete -f -c git -n __fish_git_needs_command -a bisect -d 'Find the change that introduced a bug by binary search'
+complete -f -c git -n __fish_git_needs_command -a bisect -d 'Use binary search to find what introduced a bug'
 complete -f -c git -n '__fish_git_using_command bisect' -n '__fish_prev_arg_in bisect' -xa "start\t'Start a new bisect session'
 bad\t'Mark a commit as bad'
 new\t'Mark a commit as new'
@@ -1305,7 +1305,7 @@ complete -f -c git -n '__fish_git_using_command describe' -l always -d 'Show uni
 complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Follow only the first parent of a merge commit'
 
 ### diff
-complete -c git -n __fish_git_needs_command -a diff -d 'Show changes between commits or commit and working tree'
+complete -c git -n __fish_git_needs_command -a diff -d 'Show changes between commits and working tree'
 complete -c git -n '__fish_git_using_command diff' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_ranges)'
 complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index'
 complete -c git -n '__fish_git_using_command diff' -l staged -d 'Show diff of changes in the index'
@@ -2009,12 +2009,13 @@ complete -f -c git -n '__fish_git_using_command format-patch' -l no-numbered -s
 
 ## git submodule
 set -l submodulecommands add status init deinit update set-branch set-url summary foreach sync absorbgitdirs
-complete -f -c git -n __fish_git_needs_command -a "submodule\t'Initialize, update or inspect submodules'
+complete -f -c git -n __fish_git_needs_command -a "submodule\t'Initialize, update or inspect submodules'"
+complete -f -c git -n "__fish_git_using_command submodule" -n "not __fish_seen_subcommand_from $submodulecommands" -a "
 status\t'Show submodule status'
 init\t'Initialize all submodules'
 deinit\t'Unregister the given submodules'
 update\t'Update all submodules'
-set-branch\t'Sets the default remote tracking branch for the submodule'
+set-branch\t'Set the default remote tracking branch'
 set-url\t'Sets the URL of the specified submodule'
 summary\t'Show commit summary'
 foreach\t'Run command on each submodule'

src/re.cpp

@@ -271,7 +271,7 @@ maybe_t<wcstring> regex_t::substitute(const wcstring &subject, const wcstring &r
         wcstring res(bufflen, L'\0');
         rc = pcre2_substitute(get_code(code_), to_sptr(subject), subject.size(), start_idx, options,
                               nullptr /* match_data */, nullptr /* context */, to_sptr(replacement),
-                              replacement.size(), reinterpret_cast<PCRE2_UCHAR32 *>(&res[0]),
+                              replacement.size(), reinterpret_cast<PCRE2_UCHAR *>(&res[0]),
                               &bufflen);
         if (out_repl_count) {
             *out_repl_count = std::max(rc, 0);