From 1350d27e904f7e016dd33cff01686e527b0d26ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20K=C3=BCgler?= Date: Fri, 16 May 2014 09:01:23 +0200 Subject: [PATCH] Rebase: Write an empty "quiet" file to make C Git happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 3 +++ 1 file changed, 3 insertions(+) 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 95551c3ee..8277ead84 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 { 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 { rebaseState.createFile(ONTO, upstreamCommit.name()); rebaseState.createFile(ONTO_NAME, upstreamCommitName); rebaseState.createFile(INTERACTIVE, ""); //$NON-NLS-1$ + rebaseState.createFile(QUIET, ""); //$NON-NLS-1$ ArrayList toDoSteps = new ArrayList(); toDoSteps.add(new RebaseTodoLine("# Created by EGit: rebasing " + headId.name() //$NON-NLS-1$