summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-09-03 23:33:28 -0700
committerShawn O. Pearce <spearce@spearce.org>2010-09-03 23:55:45 -0700
commit596c3f668b184e41b147aab6260c23189e521c09 (patch)
treee4bd7b18bbb34f41871dbcb07eea8bbb91214e83
parent2aa4196f1fd02851976d2c214302d87ea26663d0 (diff)
downloadjgit-596c3f668b184e41b147aab6260c23189e521c09.tar.gz
jgit-596c3f668b184e41b147aab6260c23189e521c09.zip
log: Fix commit headers and -p flag
We weren't flushing the commit message before the diff output, which meant the headers and message showed randomly interleaved with the diff rather than immediately before. Change-Id: I6cefab8d40e9d40c937e9deb12911188fec41b26 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
index 8eb2e54dc5..92cb70d4c4 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java
@@ -234,10 +234,10 @@ class Log extends RevWalkTextBuiltin {
if (showNameAndStatusOnly)
Diff.nameStatus(out, diffFmt.scan(a, b));
else {
+ out.flush();
diffFmt.format(a, b);
diffFmt.flush();
}
out.println();
- out.flush();
}
}