aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
index 714e8308f4..6506789218 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
@@ -2198,7 +2198,7 @@ public class PackWriter implements AutoCloseable {
if (!cachedPacks.isEmpty()) {
if (otp.isEdge())
return;
- if ((nFmt == PACK_WHOLE) | (nFmt == PACK_DELTA)) {
+ if (nFmt == PACK_WHOLE || nFmt == PACK_DELTA) {
for (CachedPack pack : cachedPacks) {
if (pack.hasObject(otp, next)) {
otp.setEdge();
@@ -2241,7 +2241,7 @@ public class PackWriter implements AutoCloseable {
otp.clearReuseAsIs();
}
- otp.setDeltaAttempted(reuseDeltas & next.wasDeltaAttempted());
+ otp.setDeltaAttempted(reuseDeltas && next.wasDeltaAttempted());
otp.select(next);
}