Commit a687ee20 authored by Brad King's avatar Brad King

git-gitlab-push: Require a '--force' option to force-push the topic

Do not allow users to risk losing work by default.  Our workflow does
not involve pulling first to avoid a non-fast-forward, so hide any such
advice that Git may generate.  Instead add our own advice.
parent 02274659
......@@ -22,6 +22,9 @@ OPTIONS
Show what would be pushed without actually updating the destination
Force-push the topic HEAD to rewrite the destination branch
Do not push the default branch (e.g. master)
......@@ -56,6 +59,7 @@ gitlab_configured=1
......@@ -63,6 +67,7 @@ dry_run=''
# Parse the command line options.
while test $# != 0; do
case "$1" in
-f|--force) force='+' ;;
--no-topic) no_topic=1 ;;
--dry-run) dry_run=--dry-run ;;
--no-default) no_default=1 ;;
......@@ -85,7 +90,7 @@ if test -z "$no_topic"; then
git checkout -b descriptive-name'
# The topic branch will be pushed by name.
refspecs="+HEAD:refs/heads/$topic $refspecs"
refspecs="${force}HEAD:refs/heads/$topic $refspecs"
# Fetch the current remote master branch head.
......@@ -120,9 +125,17 @@ fi
# Push. Save output and exit code.
echo "Pushing to $remote"
push_stdout=$(git push --porcelain $dry_run "$remote" $refspecs); push_exit=$?
push_config='-c advice.pushUpdateRejected=false'
push_stdout=$(git $push_config push --porcelain $dry_run "$remote" $refspecs); push_exit=$?
echo "$push_stdout"
# Advise the user to force-push if needed.
if test "$push_exit" -ne 0 && test -z "$force" &&
echo "$push_stdout" | egrep-q 'non-fast-forward'; then
echo '
Add "-f" or "--force" to push a rewritten topic.'
# Tell the user what to do next with the topic in GitLab.
if test -z "$no_topic" &&
test "$push_exit" -eq 0 &&
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment