Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 351723 - merge ignores --no-ff option
Summary: merge ignores --no-ff option
Status: CLOSED DUPLICATE of bug 336933
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 minor (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-11 11:01 EDT by Brad Cupit CLA
Modified: 2011-09-03 09:13 EDT (History)
3 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 Brad Cupit CLA 2011-07-11 11:01:28 EDT 
Build Identifier: 20110615-0604

in $USER_HOME/.gitconfig I have

[branch "master"]
    mergeoptions = --no-ff

however, when egit merges a topic branch into master I get a fast forward merge

workaround is to reset master to last-commit-not-on-topic-branch, then merge via command line

Reproducible: Always

Steps to Reproduce:
1. in $USER_HOME/.gitconfig set
[branch "master"]
    mergeoptions = --no-ff
2. create and checkout topic branch
3. make changes
4. commit to topic branch
5. checkout master
6. in egit, merge topic branch into master (in Package Explorer, right click on project -> Team -> Merge... -> select topic branch)
7. result is fast forward, even though .gitconfig says --no-ff
Comment 1 Brad Cupit CLA 2011-07-11 11:08:56 EDT 
this also happens when I merge from the History view (if master is the currently checked out branch, right click on the topic branch -> Merge)
Comment 2 Matthias Sohn CLA 2011-08-10 07:56:17 EDT 
looks like a missing feature
Comment 3 Remy Suen CLA 2011-09-03 09:13:47 EDT 

*** This bug has been marked as a duplicate of bug 336933 ***