private void resetRevert() throws IOException { repo.writeRevertHead(null); repo.writeMergeCommitMsg(null); }
private void resetMerge() throws IOException { repo.writeMergeHeads(null); repo.writeMergeCommitMsg(null); }
private void resetCherryPick() throws IOException { repo.writeCherryPickHead(null); repo.writeMergeCommitMsg(null); }
private void writeMergeInfo(RevCommit commitToPick, List<RevCommit> newParents) throws IOException { repo.writeMergeHeads(newParents.subList(1, newParents.size())); repo.writeMergeCommitMsg(commitToPick.getFullMessage()); }
private void resetMerge() throws IOException { repo.writeMergeHeads(null); repo.writeMergeCommitMsg(null); }
private void resetRevert() throws IOException { repo.writeRevertHead(null); repo.writeMergeCommitMsg(null); }
private void resetCherryPick() throws IOException { repo.writeCherryPickHead(null); repo.writeMergeCommitMsg(null); }
private void resetRevert() throws IOException { repo.writeRevertHead(null); repo.writeMergeCommitMsg(null); }
private void resetCherryPick() throws IOException { repo.writeCherryPickHead(null); repo.writeMergeCommitMsg(null); }
private void resetMerge() throws IOException { repo.writeMergeHeads(null); repo.writeMergeCommitMsg(null); }
repo.writeMergeCommitMsg(null); repo.writeMergeHeads(null); } else if (state == RepositoryState.CHERRY_PICKING_RESOLVED) { repo.writeMergeCommitMsg(null); repo.writeCherryPickHead(null); } else if (state == RepositoryState.REVERTING_RESOLVED) { repo.writeMergeCommitMsg(null); repo.writeRevertHead(null);
private void writeMergeInfo(RevCommit commitToPick, List<RevCommit> newParents) throws IOException { repo.writeMergeHeads(newParents.subList(1, newParents.size())); repo.writeMergeCommitMsg(commitToPick.getFullMessage()); }
private void writeMergeInfo(RevCommit commitToPick, List<RevCommit> newParents) throws IOException { repo.writeMergeHeads(newParents.subList(1, newParents.size())); repo.writeMergeCommitMsg(commitToPick.getFullMessage()); }
mergeMessage = new MergeMessageFormatter().format( commits, head); repo.writeMergeCommitMsg(mergeMessage); repo.writeMergeHeads(Arrays.asList(ref.getObjectId())); } else { } else { if (failingPaths != null) { repo.writeMergeCommitMsg(null); repo.writeMergeHeads(null); return new MergeResult(null, merger.getBaseCommitId(), .formatWithConflicts(mergeMessage, unmergedPaths); repo.writeMergeCommitMsg(mergeMessageWithConflicts); return new MergeResult(null, merger.getBaseCommitId(), new ObjectId[] { headCommit.getId(),
merger.getUnmergedPaths()); repo.writeRevertHead(srcCommit.getId()); repo.writeMergeCommitMsg(message);
repo.writeMergeCommitMsg(message);
public boolean reset() { try { mRepo.getGit().getRepository().writeMergeCommitMsg(null); mRepo.getGit().getRepository().writeMergeHeads(null); try { mRepo.getGit().rebase().setOperation(RebaseCommand.Operation.ABORT).call(); } catch (Exception e) { } mRepo.getGit().reset().setMode(ResetCommand.ResetType.HARD).call(); } catch (StopTaskException e) { return false; } catch (Throwable e) { setException(e); return false; } return true; } }
public boolean reset() { try { mRepo.getGit().getRepository().writeMergeCommitMsg(null); mRepo.getGit().getRepository().writeMergeHeads(null); try { // if a rebase is in-progress, need to abort it mRepo.getGit().rebase().setOperation(RebaseCommand.Operation.ABORT).call(); } catch (WrongRepositoryStateException e) { // Ignore this, it happens if rebase --abort is called without a rebase in progress. Timber.i(e, "Couldn't abort rebase while reset."); } catch (Exception e) { setException(e, R.string.error_rebase_abort_failed_in_reset); return false; } mRepo.getGit().reset().setMode(ResetCommand.ResetType.HARD).call(); } catch (StopTaskException e) { return false; } catch (Throwable e) { setException(e); return false; } return true; } }
bpm.beginTask("clearing repo state", 3); git.getRepository().writeMergeCommitMsg(null); git.getRepository().writeMergeHeads(null); bpm.update(1);
bpm.beginTask("clearing repo state", 3); git.getRepository().writeMergeCommitMsg(null); git.getRepository().writeMergeHeads(null); bpm.update(1);