commit | 4d6478a83511ecbd127bdd16e60d9baf7c366a0b | [log] [tgz] |
---|---|---|
author | Dave Borowitz <dborowitz@google.com> | Fri Jan 30 07:31:15 2015 -0800 |
committer | Dave Borowitz <dborowitz@google.com> | Fri Jan 30 09:31:58 2015 -0800 |
tree | f70ff90c3ae52d85584c78a98626922f984267e8 | |
parent | 875fc8e8a3367d2507d0f937e13b12d3ff3f6f86 [diff] |
Fix compilation broken by 875fc8e8 I had fixed this locally in the previous change but forgot to push the new patch set. Change-Id: I1e5469bf2655edf3d39baf218f4a6d2f7a35498c
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index dbfd97e..8acbcd3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -460,8 +460,7 @@ } } } - logDebug("Opened branch {}: {}, (parsed to {})", - destBranch.get(), oldRef, branchTip); + logDebug("Opened branch {}: {}", destBranch.get(), branchTip); return branchUpdate; } catch (IOException e) { throw new MergeException("Cannot open branch", e);