Merge branch '1861-squash-commits-fails-with-older-branches' into 'master'

Resolve "Squash commits fails for branches named HEAD"

Closes #1861

See merge request !1391

app/services/merge_requests/squash_service.rb

@@ -41,7 +41,7 @@ module MergeRequests
       )
 
       run_git_command(
-        %W(commit --no-verify -m #{merge_request.title}),
+        %W(commit --no-verify --message #{merge_request.title}),
         tree_path,
         git_env.merge('GIT_COMMITTER_NAME' => current_user.name,
                       'GIT_COMMITTER_EMAIL' => current_user.email,
@@ -50,8 +50,12 @@ module MergeRequests
         'commit squashed changes'
       )
 
+      # May print a warning for ambiguous refs, but we can ignore that with
+      # `--quiet` and just take the SHA, if present. HEAD here always refers to
+      # the current HEAD commit, even if there is another ref called HEAD.
+      #
       squash_sha = run_git_command(
-        %w(rev-parse HEAD),
+        %w(rev-parse --quiet --verify HEAD),
         tree_path,
         git_env,
         'get SHA of squashed commit'

changelogs/unreleased-ee/1861-squash-commits-fails-with-older-branches.yml

+---
+title: Fix squashing MRs when the repository contains a ref named HEAD
+merge_request:
+author: