From: Oleg Broytman <phd@phdru.name>
Date: Wed, 10 Nov 2021 16:08:02 +0000 (+0300)
Subject: .gitconfig: Refactor merge/pull-request aliases
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=2feb59015ad3a1864126000ad713ac874c26a651;p=dotfiles.git

.gitconfig: Refactor merge/pull-request aliases
---

diff --git a/.gitconfig b/.gitconfig
index f03671a..9740736 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -179,8 +179,11 @@
 	unstage = reset HEAD --
 
 	# Github: pull request, Gitlab: merge request
-	mr = "!f() { git fetch ${2:-origin} refs/merge-requests/$1/head:pr/$1 && git checkout pr/$1; }; f"
-	pr = "!f() { git fetch ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+	mpr = "!f() { git fetch ${2:-origin} refs/$3/$1/head:pr/$1 && if [ \"$4\" = checkout ]; then git checkout pr/$1; fi; }; f"
+	fetch-mr = "!f() { git mpr $1 $2 merge-requests; }; f"
+	merge-request = "!f() { git mpr $1 $2 merge-requests checkout; }; f"
+	fetch-pr = "!f() { git mpr $1 $2 pull; }; f"
+	pull-request = "!f() { git mpr $1 $2 pull checkout; }; f"
 	clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
 
 [branch]