)]}'
{
  "commit": "4aa052da7f65ad6eeb77cce14ef70dac82d242cc",
  "tree": "774f94b2ae37b5e08a68504122663656f29e471c",
  "parents": [
    "c4d5d8fb54f168c51827b4901b8537fca9a2abc6"
  ],
  "author": {
    "name": "Russ Cox",
    "email": "rsc@golang.org",
    "time": "Thu Jan 07 12:26:06 2021 -0500"
  },
  "committer": {
    "name": "Russ Cox",
    "email": "rsc@golang.org",
    "time": "Wed Jan 13 14:39:58 2021 +0000"
  },
  "message": "git-codereview: new sync-branch and related fixes\n\nThis CL adds a new command, \"git codereview sync-branch\",\nwhich does the appropriate git merge for the current branch.\n\nThis CL also fixes a bug in \"git codereview branchpoint\",\nand therefore also commands like \"git codereview pending\",\nwhich was getting the branchpoint wrong for merges,\nwith the effect that a merge showed too many pending CLs.\n\nThis CL also fixes a bug in \"git codereview change\", which was\nformerly willing to run \"git checkout\" with a pending merge,\nwhich had the effect of flattening the merge mysteriously.\nNow it detects the merge and refuses to run.\n\nAll of this should make merges easier and less error-prone\nas we use dev branches more often.\n\nWith the earlier CL in this stack that allows working directly\non local branches, this is now a great way to run a merge\nupdating dev.regabi:\n\n\tgit change dev.regabi\n\tgit sync-branch\n\n(with appropriate aliases to avoid typing \"codereview\").\n\nFixes golang/go#26201.\n\nChange-Id: Ic24603123ca5135a72004309f5bb208ff149c9eb\nReviewed-on: https://go-review.googlesource.com/c/review/+/279772\nTrust: Russ Cox \u003crsc@golang.org\u003e\nRun-TryBot: Russ Cox \u003crsc@golang.org\u003e\nTryBot-Result: Go Bot \u003cgobot@golang.org\u003e\nReviewed-by: Matthew Dempsky \u003cmdempsky@google.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "7c9b2820a1256e413e678c53680e60a6147220c7",
      "old_mode": 33188,
      "old_path": "git-codereview/branch.go",
      "new_id": "787a80d16c24f081f1cf60961c62b806e125b461",
      "new_mode": 33188,
      "new_path": "git-codereview/branch.go"
    },
    {
      "type": "modify",
      "old_id": "e4530eb0a70b9cc2442e298adeef7ee952edb048",
      "old_mode": 33188,
      "old_path": "git-codereview/branch_test.go",
      "new_id": "9e999b75c55334d1f6352fd172b85fe7916ae0b7",
      "new_mode": 33188,
      "new_path": "git-codereview/branch_test.go"
    },
    {
      "type": "modify",
      "old_id": "5320d9d3a097c9820fabf605a3507792b7c6aa64",
      "old_mode": 33188,
      "old_path": "git-codereview/change.go",
      "new_id": "24cbb71e9fd1d603c203edefc98d8a32700b919d",
      "new_mode": 33188,
      "new_path": "git-codereview/change.go"
    },
    {
      "type": "modify",
      "old_id": "a72b6db49a21c5645829378b5823ed69bc2f1107",
      "old_mode": 33188,
      "old_path": "git-codereview/doc.go",
      "new_id": "b9eb2301dd9565ce087a767c743911be014c869a",
      "new_mode": 33188,
      "new_path": "git-codereview/doc.go"
    },
    {
      "type": "modify",
      "old_id": "55ab8ed08739528aa47ed106a132855e6887ec13",
      "old_mode": 33188,
      "old_path": "git-codereview/mail.go",
      "new_id": "3b60eb37c0510916931d1aa68e3b92bc5bf523b2",
      "new_mode": 33188,
      "new_path": "git-codereview/mail.go"
    },
    {
      "type": "modify",
      "old_id": "c1594b567efbf985aca11ad425fafa791819c5ad",
      "old_mode": 33188,
      "old_path": "git-codereview/pending.go",
      "new_id": "f3e3369230bc8e7c1d19d6886a9aa0553c444791",
      "new_mode": 33188,
      "new_path": "git-codereview/pending.go"
    },
    {
      "type": "modify",
      "old_id": "0deb039eb696e856e1ed5bd1d5f6a418ec8c0009",
      "old_mode": 33188,
      "old_path": "git-codereview/review.go",
      "new_id": "5c7f16dc8f981f7e471c6e63b3c88609f1091e01",
      "new_mode": 33188,
      "new_path": "git-codereview/review.go"
    },
    {
      "type": "modify",
      "old_id": "9ea3e67827867373f4c9019feac0592e9f812059",
      "old_mode": 33188,
      "old_path": "git-codereview/sync.go",
      "new_id": "0334341a899dda4a6d89448d5b023afe01742e38",
      "new_mode": 33188,
      "new_path": "git-codereview/sync.go"
    },
    {
      "type": "modify",
      "old_id": "72cbdf82d0d3b44fc1a5f0bcb44b78a5ced06331",
      "old_mode": 33188,
      "old_path": "git-codereview/sync_test.go",
      "new_id": "14980984cb8e5903ee33f3ee7975135bd1c99a82",
      "new_mode": 33188,
      "new_path": "git-codereview/sync_test.go"
    },
    {
      "type": "modify",
      "old_id": "b1b553407f40302b50cba759b1dec97147abc6e1",
      "old_mode": 33188,
      "old_path": "git-codereview/util_test.go",
      "new_id": "a4f0b51159e8447c800a9e651443a318631bd45e",
      "new_mode": 33188,
      "new_path": "git-codereview/util_test.go"
    }
  ]
}