go-x-review/git-codereview/sync.go, branch main

git-codereview: support remote other than "origin"

2026-04-09T15:20:06Z

For the git-codereview commands to works on any Go's repositories, the remote name for "origin" must be pointed to the Go original repository URL (in most cases the one with go.googlesource.com domain). The problem is when the "origin" is from the fork, all of the git-codereview commands then will not works. For example, in computer X, I clone the this repository from "https://go.googlesource.com/review" (the origin) and then push my changes on "git@git.sr.ht:~shulhan/go-x-review" (the fork). In another computer Y, I then clone from the fork to continue my works. The fork become origin. One of the solution is to rename the remote names manually each time we clone the fork. The only cons using this solution is every time new branch created we need to remember to pass "--set-upstream" during git push. This changes introduce "remote" configuration in codereview.cfg. When one first working on fork of Go repository, they set the "remote" key, commit it, and push it. When they cloned the fork, they did not needs to changes anything except adding new remote using the pre-defined name. Change-Id: I335d08fd8b7efe17ba07b3c0a3794f9ccf59b339

git-codereview: frame sync as git codereview sync

2025-07-09T15:35:44Z

The codereview binary referred to the sync subcommand as merely "git sync" in a number of places in user surfaces. This was wrong and misleading, so the code now refers to it with the codereview parent subcommand in the name (i.e., a "git codereview sync"). Change-Id: Icf3f96a8c76b57319bc3101b3e9fd0cbd8cecea9 Reviewed-on: https://go-review.googlesource.com/c/review/+/685855 Auto-Submit: Sean Liao LUCI-TryBot-Result: Go LUCI Reviewed-by: Carlos Amedee Reviewed-by: Sean Liao Reviewed-by: David Chase

git-codereview: explicitly include the codereview subcommand in suggested commands

2025-06-17T17:40:36Z

If a user does not have the recommended aliases in their .gitconfig, the suggested command will not work. Several suggestions have the codereview subcommand already; this change updates all suggestions to include it. Change-Id: I3613f24172c2d90a7038f263cad93cbdcddbbbca Reviewed-on: https://go-review.googlesource.com/c/review/+/681176 LUCI-TryBot-Result: Go LUCI Reviewed-by: Junyang Shao Reviewed-by: Sean Liao Reviewed-by: Cherry Mui Auto-Submit: Sean Liao

git-codereview: use --no-ff for sync-branch

2024-04-03T20:29:03Z

When working with dev branches, it is possible that a branch needed to be sync'd can be fast-forworded. For example, there is no new commit since the last sync. Or this could happen with multi-release-cycle branches, where we reverse-sync'd to master for one release cycle, later try to sync master to branch for the next cycle. Fast-forwording is generally not what we want (and it confuses the git-codereview tool when trying to craft the CL description). Pass --no-ff to ensure we create a merge commit. Change-Id: Ic204882d0304ec538c2e219d34e370ba98db9374 Reviewed-on: https://go-review.googlesource.com/c/review/+/319069 LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov

git-codereview: remove usage of io/ioutil

2024-01-25T17:04:12Z

io/ioutil is now deprecated. Use non-deprecated equivalents. Change-Id: Iad1cc9c14dbdad3a6f9ada25072bc194bace4081 Reviewed-on: https://go-review.googlesource.com/c/review/+/543615 Reviewed-by: qiulaidongfeng <2645477756@qq.com> Auto-Submit: Dmitri Shuralyov Reviewed-by: Cherry Mui Reviewed-by: Dmitri Shuralyov TryBot-Result: Gopher Robot Reviewed-by: Dmitri Shuralyov

git-codereview: fix sync-branch to work in worktrees

2022-04-06T16:00:51Z

Change-Id: I8a3bcad53eae3273dc498ba94d53fe2d50b58520 Reviewed-on: https://go-review.googlesource.com/c/review/+/290212 Trust: Filippo Valsorda Run-TryBot: Filippo Valsorda Auto-Submit: Filippo Valsorda TryBot-Result: Gopher Robot Reviewed-by: Russ Cox

git-codereview: disable message about skipped cherry-picks in sync

2022-01-27T19:37:11Z

Sync very frequently is done to zero out submitted CLs. New git versions print hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" This message is noise more often than signal, so disable it during sync. Change-Id: Ida8867cbd614027f43bbbe6e6389a8920aae5293 Reviewed-on: https://go-review.googlesource.com/c/review/+/351209 Trust: Russ Cox Run-TryBot: Russ Cox Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot

git-codereview: set GIT_GOFMT_HOOK=off for sync-branch

2021-05-18T20:24:57Z

When doing a merge, it's unlikely that someone would want to run gofmt for files they didn't edit, so turn that off by default. Change-Id: I6c95b866740d5deda575feda256eee35dba3d9d1 Reviewed-on: https://go-review.googlesource.com/c/review/+/320269 Trust: Katie Hockman Run-TryBot: Katie Hockman TryBot-Result: Go Bot Reviewed-by: Russ Cox

git-codereview: add sync-branch -merge-back-to-parent

2021-01-13T14:40:17Z

Dev branches come to an end. Making sync-branch help that process instead of forcing people to follow a playbook will help avoid mistakes. The flag name was chosen to be very unlikely to be used accidentally, and the commit subject and message both are distinct to make clear to reviewers what they are being asked to +2. The Merge List is also included in full and is likely to be quite large, yet another signal for everyone involved about the magnitude and weight of the change. Change-Id: I91cdda2b85cd3811711a339f4f3290fee109022e Reviewed-on: https://go-review.googlesource.com/c/review/+/282534 Trust: Russ Cox Reviewed-by: Matthew Dempsky

git-codereview: clean up detached HEAD mode

2021-01-13T14:40:11Z

Long ago I decided to return origin/HEAD from b.OriginBranch in detached HEAD mode, thinking it would cause obvious failures. But the joke was on me - origin/HEAD is a real thing in git, and HEAD tracking origin/HEAD is not the right answer on dev branches. Now that each branch's codereview.cfg typically has the branch info we need, we can use that in detached HEAD mode to be able to provide useful displays in commands like "git pending". And we can be careful not to do that when we don't know the actual branch. This commit cleans all that up. Change-Id: I0e59bcb6f9b61e0cdce7a27299b7f29fef8e7048 Reviewed-on: https://go-review.googlesource.com/c/review/+/282616 Trust: Russ Cox Reviewed-by: Matthew Dempsky