Bug 471845 - JGit recursive merge should support extra options
Summary: JGit recursive merge should support extra options
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 4.1   Edit
Hardware: All All
: P3 enhancement with 6 votes (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-07-04 07:31 EDT by Andrey Hsiao CLA
Modified: 2018-08-14 02:42 EDT (History)
4 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Andrey Hsiao CLA 2015-07-04 07:31:38 EDT 
When doing Git merge from the command line, one can specify extra options.

Eg: git merge -s recursive -Xignore-all-space the-branch-to-merge

However, from the JGit API, it seems there is no way to specify these extra (-X) options.

It would be helpful if JGit could have this feature.
Comment 1 Andrey Hsiao CLA 2015-07-06 04:20:38 EDT 
Since sometimes the file will have different CRLF line endings, merging will cause the whole file to conflict. (the markers will show the whole file as conflict).

In the Git command line, we use -Xignore-all-space to bypass this issue.

Hopefully, JGit can support this as well.
Comment 2 Benjamin Brandl CLA 2018-08-14 02:42:14 EDT 
In context of merging and mixed OS environments, this feature is very interessting. Especially since git option merge.renormalize seems to have no effect in JGit.

[merge.renormalize](https://git-scm.com/docs/merge-config#merge-config-mergerenormalize)