[llvm] fe025a3 - [docs][Phabricator] git migration related update
Jinsong Ji via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 26 11:08:15 PDT 2020
Author: Jinsong Ji
Date: 2020-03-26T18:08:06Z
New Revision: fe025a34902b3dff5e98588f0fdee7023274731a
URL: https://github.com/llvm/llvm-project/commit/fe025a34902b3dff5e98588f0fdee7023274731a
DIFF: https://github.com/llvm/llvm-project/commit/fe025a34902b3dff5e98588f0fdee7023274731a.diff
LOG: [docs][Phabricator] git migration related update
1.Add instructions to update author when committing other's patch
We have updated DeveloperPolicy to show how to change author in
https://reviews.llvm.org/D72468
We should also update Phabricator page to include such infomation,
in case people follow the steps here and forget to update author info.
2. Replace `git llvm push` with `git push`
Reviewed By: probinson
Differential Revision: https://reviews.llvm.org/D76718
Added:
Modified:
llvm/docs/Phabricator.rst
Removed:
################################################################################
diff --git a/llvm/docs/Phabricator.rst b/llvm/docs/Phabricator.rst
index 9f35af906890..bd843d4f433c 100644
--- a/llvm/docs/Phabricator.rst
+++ b/llvm/docs/Phabricator.rst
@@ -169,7 +169,7 @@ yourself.
Using the Arcanist tool can simplify the process of committing reviewed code as
it will retrieve reviewers, the ``Differential Revision``, etc from the review
and place it in the commit message. You may also commit an accepted change
-directly using ``git llvm push``, per the section in the :ref:`getting started
+directly using ``git push``, per the section in the :ref:`getting started
guide <commit_from_git>`.
Note that if you commit the change without using Arcanist and forget to add the
@@ -194,8 +194,15 @@ This will create a new branch called ``arcpatch-D<Revision>`` based on the
current ``master`` and will create a commit corresponding to ``D<Revision>`` with a
commit message derived from information in the Phabricator review.
-Check you are happy with the commit message and amend it if necessary. Then,
-make sure the commit is up-to-date, and commit it. This can be done by running
+Check you are happy with the commit message and amend it if necessary.
+For example, ensure the 'Author' property of the commit is set to the original author.
+You can use a command to correct the author property if it is incorrect:
+
+::
+
+ git commit --amend --author="John Doe <jdoe at llvm.org>"
+
+Then, make sure the commit is up-to-date, and commit it. This can be done by running
the following:
::
@@ -203,7 +210,7 @@ the following:
git pull --rebase origin master
git show # Ensure the patch looks correct.
ninja check-$whatever # Rerun the appropriate tests if needed.
- git llvm push
+ git push
Or
More information about the llvm-commits
mailing list