Date: Sat, 28 Aug 2021 17:44:34 -0300 From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: freebsd-git@FreeBSD.org Subject: Phabricator workflow with Git Message-ID: <20210828204434.n45rsndnehy2tsnb@t480.local>
next in thread | raw e-mail | index | archive | help
--iebmsg3wjstadjx3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi. I'm currently using this workflow: - - - - - - - - - - - - - - - - - - - - - - - - - // Create a new branch $ git checkout -b FEATURE // Change stuff and git commit // Note that you already can include the Review information in // Phabricator format. ``` <<Replace this line with your Revision Title>> Summary: Test Plan: Reviewers: Subscribers: ``` // Open a review with the first commit $ arc diff --create HEAD~ // If it's accepted, fix the commit log message, rebase with main // branch, and push $ git commit --amend $ git rebase -i main $ git push remote_name FEATURE:main // If it's NOT accepted // Change stuff and add a second git commit // Update review with the two commits $ arc diff --update DXXXXX HEAD~2 // If it's accepted, you can soft reset both commits and do a new one // or, just use `git merge and squash`. // merge/squash way // Set the second commit to be squashed $ git rebase -i main ``` pick 954c5d4626 Readme: First commit squash 7231873f23 Makefile: Second commit ``` or $ git reset --soft HEAD~2 // And add a final commit // Submit $ git push remote_name FEATURE:main // Delete FEATURE branch $ git checkout main $ git pull origin main --no-ff $ git branch -d FEATURE - - - - - - - - - - - - - - - - - - - - - - - - - That is it. I know there are git-arc (tools/tools/git-arc) on base, but I still didn't use it. I just want to check if there are other ways to do that (that you recommend), or if can I document it, at least for now, on our Phabricator Wiki page [1]. 1 - https://wiki.freebsd.org/Phabricator Regards. --=20 Danilo G. Baio (dbaio) --iebmsg3wjstadjx3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEORj0UTsjzCy+enIkmpN7LfMuiNcFAmEqoC5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDM5 MThGNDUxM0IyM0NDMkNCRTdBNzIyNDlBOTM3QjJERjMyRTg4RDcACgkQmpN7LfMu iNeDBg/+KXKbIDTRABliByBtpp7dkTkQNoTVnJ1unvwyi5+wI3oaFc0wc/wjaQ0M djFBCoQAvCxPTv3AA6cX1aMlUyOy3t+1+UPHrVkL6NDPkoEWAxcr389oPBcGopv8 bknINgBN4gRav8/gXXXt7M4hktzqyWNck0gxsh9KMXuXSd5584B6ZY6TfBSWP+dW 9dNg0zZ7B3y93k9utfLt/UTF48saMsuuJJubK2m6ReLuzaPy9pH985A9pVjclHQr PctJOBWAY46Eo81Xge/oV3sgh7cm3nHfQg8hAn6jt4QMIoyO+eHOGSuEdhYVLVHi BoF89MCCZQaWpBCicvHAuO+rbwAika61Au9McIoj1PHzIqX6fNYBWMsAfMxf1JKV t1HOIPVbqQfjMGCdtZ9fTD1ZyObX77Jl+0PdStTjQpQi0NvksnVdiqHkZHoST+HM Yihejo79UL7ZUPEDM45E32/P5ZtDkXIVmIXFsf7hWux1N4k9tS7ohnQjNZpUPqlF ks3Z67iyoI7IQKmC5pNlyHsZrB8/H5xnBA/E694qs+sKe28KBPwt8ReevFUnq9Qd /01M3H6QlXyoBzOWR0bqk72awkcqrGcEqNCXkwvwAcAC5/Q/g6kjilplYcPwJ8ov FiDvuIGeG+g546XIcA0iQ12zHPytgnIyxEn3VKLfC3XkDHsY25k= =sZFC -----END PGP SIGNATURE----- --iebmsg3wjstadjx3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210828204434.n45rsndnehy2tsnb>