diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2017-07-28 06:08:33 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2017-07-28 06:08:33 -0400 |
| commit | 5188c231043982c83f5bfbb5b0a7a8bde58cfe42 (patch) | |
| tree | 39ab7e84f40de21504805bf54659b11c86d2b026 /org.eclipse.jgit/src/org | |
| parent | 94aebcb94913bd565d39f997609abaa3e247dd11 (diff) | |
| parent | da0770fdec64b00be7c4c22d5acebee622bbf5f3 (diff) | |
| download | jgit-5188c231043982c83f5bfbb5b0a7a8bde58cfe42.tar.gz jgit-5188c231043982c83f5bfbb5b0a7a8bde58cfe42.zip | |
Merge "Fix committing empty commits"
Diffstat (limited to 'org.eclipse.jgit/src/org')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index 274ece6dca..e29fc05463 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -482,7 +482,7 @@ public class CommitCommand extends GitCommand<RevCommit> { JGitText.get().entryNotFoundByPath, only.get(i))); // there must be at least one change - if (emptyCommit) + if (emptyCommit && !allowEmpty.booleanValue()) // Would like to throw a EmptyCommitException. But this would break the API // TODO(ch): Change this in the next release throw new JGitInternalException(JGitText.get().emptyCommit); |