mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
4c38988ba9
* feat(mr): support Forgejo/Codeberg pull request URLs Codeberg and other Forgejo instances expose pull requests under refs/pull/<id>/head instead of GitLab's refs/merge-requests/<id>/head, so passing a Codeberg pull request URL to git mr fetched the wrong ref. Recognize the /pulls/<id> URL shape and switch to the matching ref for that case, leaving the GitLab URL and bare numeric id behavior unchanged. Closes #1213 * test(git-mr): cover Forgejo/Codeberg URLs, regenerate man docs Add a bats test that exercises the pulls URL branch via a local insteadOf remote rewrite (no real HTTP endpoint needed), and bring git-mr.1/git-mr.html in line with the git-mr.md changes. --------- Co-authored-by: vjymisal0 <vijay.looprai@gmail.com>
37 lines
994 B
Bash
Executable file
37 lines
994 B
Bash
Executable file
#!/usr/bin/env bash
|
|
|
|
set -eu
|
|
|
|
if [ -z "${1-}" ] ; then
|
|
echo "mr number or URL required. See --help for usage." 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
remote_ref_kind=merge-requests
|
|
|
|
if test "$1" = "clean"; then
|
|
git for-each-ref refs/heads/mr/* --format='%(refname)' | while read -r ref; do
|
|
git branch -D "${ref#refs/heads/}"
|
|
done
|
|
exit 0
|
|
elif [[ $1 =~ ^(https?://[^/]+/(.+))/merge_requests/([0-9]+).*$ ]]; then
|
|
remote=${BASH_REMATCH[1]}.git
|
|
id=${BASH_REMATCH[3]}
|
|
elif [[ $1 =~ ^(https?://[^/]+/(.+))/pulls/([0-9]+).*$ ]]; then
|
|
# Forgejo/Codeberg pull request URL, e.g.
|
|
# https://codeberg.org/owner/repository/pulls/453
|
|
remote=${BASH_REMATCH[1]}.git
|
|
id=${BASH_REMATCH[3]}
|
|
remote_ref_kind=pull
|
|
else
|
|
id=$1
|
|
remote=${2:-origin}
|
|
fi
|
|
|
|
branch=mr/$id
|
|
remote_ref=refs/$remote_ref_kind/$id/head
|
|
git fetch -fu "$remote" "$remote_ref:$branch"
|
|
git checkout "$branch"
|
|
git config --local --replace "branch.$branch.merge" "$remote_ref"
|
|
git config --local --replace "branch.$branch.remote" "$remote"
|