强制功能分支在合并或推送之前重新设置基础 [英] Force Feature Branch to be Rebased Before it is Merged or Pushed

问题描述

在我们的项目中，我们有一个 develop 分支.我们有六名开发人员可以自由推动开发，但我们要求他们在合并之前将其功能分支重新定位到开发之上.有时，人们会忘记这样做，这会在开发时创建更丑陋的合并历史.

In our project, we have a develop branch. We have half a dozen developers who are free to push to develop, but we've asked them to rebase their feature branches on top of the develop before they do the merge. Occasionally, people forget to do this and it creates an uglier merge history on develop.

git 中是否有配置设置，或者 gitlab 中的设置可以用来防止非快进合并的合并?理想情况下，我们希望 GitLab 中的策略可以在远程服务器上打开/关闭，这样我们就可以全局关闭它.

Is there a config setting in git, or a setting in gitlab that we can use to prevent merges that are not fast forward merges? Ideally, we'd like a policy in GitLab that can turn on/off on the remote server, so we can turn this off globally.

推荐答案

首先，通常的配置是服务器只接受快进合并(除非被-f覆盖).但是我假设您的情况是人们拥有自己的功能分支，然后将开发合并到该分支中，然后推送开发，所以现在历史记录中有合并提交.

First of all, the usual configuration is for the server to only accept fast forward merges (unless overridden by -f). But I'm assuming your case is where people have their own feature branch, then merge develop into that and then push develop, so now the history has that merge commit.

在服务器上，你可以设置一个 git update hook.更新挂钩将在每个分支运行一次，并接收分支名称的参数、被推送的新提交的尖端以及要添加新提交的分支的尖端(即 origin/branchName).脚本的返回值指示是拒绝还是接受提交.您可以简单地检查这两个提交之间是否有任何合并提交.

On the server, you can set up a git update hook. The update hook will be run once per branch and receive arguments of the branch name, the tip of the new commit being pushed and the tip of the branch onto which to add the new commits (i.e., the origin/branchName). The return value of the script indicates whether to reject or accept the commit. You can simply check if there are any merge commits in between these two commits.

#!/bin/sh
# .git/hooks/update

refname="$1"
oldrev="$2"
newrev="$3"

numMergeCommits=$(git rev-list --count --merges $oldrev..$newrev)

if [ $numMergeCommits -gt 0 ]; then
   echo "Rejected - pushed branch must not contain any merges"
   exit 1
fi

exit 0

请注意，这也不能被 -f 标志覆盖.此外，该 echo "Rejected..." 语句中的文本会回显到远程推送器，因此您可以在那里放置更具描述性的消息，希望带有指向 wiki 页面的链接，向他们展示如何使用rebase 以使提交成为正确的形式.

Note that this can't be overridden with the -f flag as well. Also, the text that is in that echo "Rejected..." statement is echoed back to the remote pusher, so you can put a more descriptive message there, hopefully with a link to a wiki page showing them how to rework their branch using rebase to get the commit into the proper form.

这篇关于强制功能分支在合并或推送之前重新设置基础的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！