@Test public void resetWithHardOptionWhenThereIsMerge_mergeNoteShouldBeCleared() throws IOException { writeSomethingToCache(); commitToBranch("some_branch"); Gfs.merge(gfs).source("some_branch").commit(false).execute(); GfsReset.Result result = Gfs.reset(gfs).hard(true).execute(); assertTrue(result.isSuccessful()); assertNull(status.mergeNote()); }
@Nonnull public GfsReset hard(boolean hard) { this.hard = hard; return this; }
GfsReset extends GfsCommand<GfsReset.Result> { @Nonnull public GfsReset hard(boolean hard) { this.hard = hard; return this; } }
GfsReset extends GfsCommand<GfsReset.Result> { @Nonnull public GfsReset hard(boolean hard) { this.hard = hard; return this; } GfsReset(GitFileSystem gfs); }
GfsReset extends GfsCommand<GfsReset.Result> { @Nonnull public GfsReset hard(boolean hard) { this.hard = hard; return this; } GfsReset(GitFileSystem gfs); @Nonnull GfsReset soft(boolean soft); @Nonnull GfsReset hard(boolean hard); @Nonnull GfsReset revision(String revision); }
GfsReset extends GfsCommand<GfsReset.Result> { @Nonnull public GfsReset hard(boolean hard) { this.hard = hard; return this; } GfsReset(GitFileSystem gfs); @Nonnull GfsReset soft(boolean soft); @Nonnull GfsReset hard(boolean hard); @Nonnull GfsReset revision(String revision);  }