1 Using Gerrit without git-cl
2 ===========================
7 The following must be executed within the Skia source repository.
9 This command sets up a Git commit-message hook to add a unique Change-Id to
10 each commit. Gerrit only accepts changes with a Change-Id and uses it to
11 identify which review a change applies to.
13 experimental/tools/set-change-id-hook
15 If you acquired Skia from a mirror (such as GitHub), you need to change the
16 `origin` remote to point to point to googlesource. Advanced uses will note
17 that there is nothing special about the string `origin` and that you could call
18 this remote anything you want, as long as you use that name for `get push`.
20 git remote set-url origin 'https://skia.googlesource.com/skia.git'
26 Go to [skia.googlesource.com/new-password](https://skia.googlesource.com/new-password)
27 and follow the instructions.
33 1. Create a topic branch
37 You may want to set a tracking branch at this time with:
39 git checkout -b TOPIC -t origin/main
43 echo FOO >> whitespace.txt
44 git commit --all --message 'Change Foo'
47 `git log` should show that a Change-Id line has been added you your commit
51 3. If You have multiple commits in your branch, Gerrit will think you want
52 multiple changes that depend on each other. If this is not what you want,
53 you need to squash the commits.
57 git push origin @:refs/for/main
59 `@` is shorthand for `HEAD`, introduced in git v1.8.5.
61 If you want to target a branch other than `main`, that can be specified
62 here, too. For example:
64 git push origin @:refs/for/chrome/m57
66 [Gerrit Upload Documentation](https://gerrit-review.googlesource.com/Documentation/user-upload.html)
68 5. Open in web browser:
70 bin/sysopen https://skia-review.googlesource.com/c/skia/+/$(bin/gerrit-number @)
76 1. Edit your commits more.
78 echo BAR >> whitespace.txt
79 git commit --all --amend
81 Changes to the commit message will be sent with the push as well.
84 2. Re-squash if needed. (Not needed if you only amended your original commit.)
89 git push origin @:refs/for/main
91 If you want to set a comment message for this patch set, do this instead:
93 M=$(experimental/tools/gerrit_percent_encode 'This is the patch set comment message!')
94 git push origin @:refs/for/main%m=$M
96 The title of this patch set will be "This is the patch set comment message!".
99 Triggering Commit-Queue Dry Run when you upload a patch
100 -------------------------------------------------------
102 M=$(experimental/tools/gerrit_percent_encode 'This is the patch set comment message!')
103 git push origin @:refs/for/main%l=Commit-Queue+1,m=$M
109 On your current branch, after uploading to gerrit:
111 git cl issue $(bin/gerrit-number @)
113 Now `git cl try` and `bin/try` will work correctly.
119 You may want to make git aliases for common tasks:
121 git config alias.gerrit-push 'push origin @:refs/for/main'
123 The following alias amends the head without editing the commit message:
125 git config alias.amend-head 'commit --all --amend --reuse-message=@'
127 Set the CL issue numnber:
129 git config alias.setcl '!git-cl issue $(bin/gerrit-number @)'
131 The following shell script will squash all commits on the current branch,
132 assuming that the branch has an upstream topic branch.
134 squash_git_branch() {
135 local MESSAGE="$(git log --format=%B ^@{upstream} @)"
136 git reset --soft $(git merge-base @ @{upstream})
137 git commit -m "$MESSAGE" -e
140 This shell script pushes to gerrit and adds a message to a patchset:
142 gerrit_push_with_message() {
143 local REMOTE='origin'
144 local REMOTE_BRANCH='main'
145 local MESSAGE="$(echo $*|sed 's/[^A-Za-z0-9]/_/g')"
146 git push "$REMOTE" "@:refs/for/${REMOTE_BRANCH}%m=${MESSAGE}"
149 These shell scripts can be turned into Git aliases with a little hack:
151 git config alias.squash-branch '!M="$(git log --format=%B ^@{u} @)";git reset --soft $(git merge-base @ @{u});git commit -m "$M" -e'
153 git config alias.gerrit-push-message '!f(){ git push origin @:refs/for/main%m=$(echo $*|sed "s/[^A-Za-z0-9]/_/g");};f'
155 If your branch's upstream branch (set with `git branch --set-upstream-to=...`)
156 is set, you can use that to automatically push to that branch:
158 gerrit_push_upstream() {
159 local UPSTREAM_FULL="$(git rev-parse --symbolic-full-name @{upstream})"
160 case "$UPSTREAM_FULL" in
162 (*) echo "Set your remote upstream branch."; return 2;;
164 local UPSTREAM="${UPSTREAM_FULL#refs/remotes/}"
165 local REMOTE="${UPSTREAM%%/*}"
166 local REMOTE_BRANCH="${UPSTREAM#*/}"
167 local MESSAGE="$(echo $*|sed 's/[^A-Za-z0-9]/_/g')"
168 echo git push $REMOTE @:refs/for/${REMOTE_BRANCH}%m=${MESSAGE}
169 git push "$REMOTE" "@:refs/for/${REMOTE_BRANCH}%m=${MESSAGE}"
174 git config alias.gerrit-push '!f()(F="$(git rev-parse --symbolic-full-name @{u})";case "$F" in (refs/remotes/*);;(*)echo "Set your remote upstream branch.";return 2;;esac;U="${F#refs/remotes/}";R="${U%%/*}";B="${U#*/}";M="$(echo $*|sed 's/[^A-Za-z0-9]/_/g')";echo git push $R @:refs/for/${B}%m=$M;git push "$R" "@:refs/for/${B}%m=$M");f'