aboutsummaryrefslogtreecommitdiff
path: root/git-codereview/branch.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2021-02-17 10:23:46 -0500
committerRuss Cox <rsc@golang.org>2021-02-18 16:25:55 -0500
commitde39345c7586e9110d8699d299bdc8100f35a5cb (patch)
treeb797a25ac295ed44ef263192c8c8b31d98a8a198 /git-codereview/branch.go
parent19899311a872616f0eb00d6eadccc1109d9047d3 (diff)
downloadgo-x-review-1.0.1.tar.xz
hackv1.0.1
Change-Id: I1c289dde45230a3362f54037ea18023278b05ffd
Diffstat (limited to 'git-codereview/branch.go')
-rw-r--r--git-codereview/branch.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-codereview/branch.go b/git-codereview/branch.go
index d25c4c9..37da5fa 100644
--- a/git-codereview/branch.go
+++ b/git-codereview/branch.go
@@ -273,7 +273,6 @@ Log:
c := &Commit{
Hash: fields[i],
ShortHash: fields[i+1],
- Parent: parents[0],
Parents: parents,
Tree: fields[i+3],
Message: fields[i+4],
@@ -282,7 +281,9 @@ Log:
AuthorEmail: fields[i+7],
AuthorDate: fields[i+8],
}
-
+ if len(c.Parents) > 0 {
+ c.Parent = c.Parents[0]
+ }
if len(c.Parents) > 1 {
// Found merge point.
// Merges break the invariant that the last shared commit (the branchpoint)