Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 322460 - Support synchronizing against FETCH_HEAD
Summary: Support synchronizing against FETCH_HEAD
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.9.0   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-08-11 22:33 EDT by Benjamin Muskalla CLA
Modified: 2011-11-04 05:15 EDT (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Benjamin Muskalla CLA 2010-08-11 22:33:08 EDT
The Synchronize wizard should support FETCH_HEAD besides HEAD. This would make it easy to prefetch changes from the remote and applying them one by one. This would be pretty similar to the following scenario:

git fetch git://repo.or.cz/stranger.git for-junio
git log -p ..FETCH_HEAD
git merge FETCH_HEAD

Does that make sense? Or should we always fetch the remote changes when synchronizing?
Comment 1 Stefan Lay CLA 2010-08-12 05:12:38 EDT
I think we should always fetch remote changes when synchronizing. This does not change the eclipse workspace and does no harm. And it would be what I expect when I call synchronize on a remote branch.

However, your proposal makes a lot of sense to me. When you have not fetched a branch but just a commit like for example for gerrit it would be interesting to see the difference between your HEAD and the FETCH_HEAD.
Comment 2 Dariusz Luksza CLA 2010-10-07 14:45:02 EDT
Automatically launching fetch action when remote repository is selected wouldn't be a good solution in my opinion. We shouldn't force uses to have a connection to remote while synchronizing.

But from the other hand this would be a great feature if we could give a possibility to "refresh" refs before synchronizing, therefore I think that we should add two new check boxes to synchronization dialog (eg. 'fetch remote data before synchronization'). One for source and one for remote refs. Based on their state the fetch action should be launched or not.

With this approach we would have more flexibility and IMHO it is more user friendly and useful.
Comment 3 Dariusz Luksza CLA 2011-05-12 19:19:32 EDT
Change 3403[1] adds additional refs into synchronize wizard

http://egit.eclipse.org/r/#change,3403
Comment 4 Dariusz Luksza CLA 2011-11-04 05:15:41 EDT
Merged as commit 6d9384aff46d1329b7c90fad999da5b60b6ded48