diff options
| author | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-16 09:01:23 +0200 |
|---|---|---|
| committer | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-16 09:01:23 +0200 |
| commit | 1350d27e904f7e016dd33cff01686e527b0d26ad (patch) | |
| tree | 2bfbc9ab44b01351e7d28df3e4d9a76c96a0728f | |
| parent | 292cfab10d76fd372f76c672e96e9d168f8d7abf (diff) | |
| download | jgit-1350d27e904f7e016dd33cff01686e527b0d26ad.tar.gz jgit-1350d27e904f7e016dd33cff01686e527b0d26ad.zip | |
Rebase: Write an empty "quiet" file to make C Git happy
C git tries to read this file from the rebase state directory and
complains about it not being there for rebases started by JGit. An empty
'quiet' file represents the (verbose) default.
Change-Id: I1844ccbf8d35442d7a8918b57b67eb9b9efd6352
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 95551c3ee0..8277ead84c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -145,6 +145,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> { private static final String INTERACTIVE = "interactive"; //$NON-NLS-1$ + private static final String QUIET = "quiet"; //$NON-NLS-1$ + private static final String MESSAGE = "message"; //$NON-NLS-1$ private static final String ONTO = "onto"; //$NON-NLS-1$ @@ -928,6 +930,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { rebaseState.createFile(ONTO, upstreamCommit.name()); rebaseState.createFile(ONTO_NAME, upstreamCommitName); rebaseState.createFile(INTERACTIVE, ""); //$NON-NLS-1$ + rebaseState.createFile(QUIET, ""); //$NON-NLS-1$ ArrayList<RebaseTodoLine> toDoSteps = new ArrayList<RebaseTodoLine>(); toDoSteps.add(new RebaseTodoLine("# Created by EGit: rebasing " + headId.name() //$NON-NLS-1$ |