Class MergeConfig

java.lang.Object
org.eclipse.jgit.merge.MergeConfig

public class MergeConfig extends Object
Holds configuration for merging into a given branch
Since:
3.3
  • Field Details

    • fastForwardMode

      private final MergeCommand.FastForwardMode fastForwardMode
    • squash

      private final boolean squash
    • commit

      private final boolean commit
  • Constructor Details

    • MergeConfig

      private MergeConfig(String branch, Config config)
    • MergeConfig

      private MergeConfig()
  • Method Details

    • getConfigForCurrentBranch

      public static MergeConfig getConfigForCurrentBranch(Repository repo)
      Get merge configuration for the current branch of the repository
      Parameters:
      repo - a Repository object.
      Returns:
      merge configuration for the current branch of the repository
    • getParser

      public static final Config.SectionParser<MergeConfig> getParser(String branch)
      Get a parser for use with Config.get(SectionParser)
      Parameters:
      branch - short branch name to get the configuration for, as returned e.g. by Repository.getBranch()
      Returns:
      a parser for use with Config.get(SectionParser)
    • getFastForwardMode

      public MergeCommand.FastForwardMode getFastForwardMode()
      Get the fast forward mode configured for this branch
      Returns:
      the fast forward mode configured for this branch
    • isSquash

      public boolean isSquash()
      Whether merges into this branch are configured to be squash merges, false otherwise
      Returns:
      true if merges into this branch are configured to be squash merges, false otherwise
    • isCommit

      public boolean isCommit()
      Whether --no-commit option is not set.
      Returns:
      false if --no-commit is configured for this branch, true otherwise (even if --squash is configured)
    • getFastForwardMode

      private static MergeCommand.FastForwardMode getFastForwardMode(Config config, String[] mergeOptions)
    • isMergeConfigOptionSet

      private static boolean isMergeConfigOptionSet(String optionToLookFor, String[] mergeOptions)
    • getMergeOptions

      private static String[] getMergeOptions(String branch, Config config)