Bugzilla – Full Text Bug Listing
| Summary: | Push does not update remote tracking branch with Synchronize view, "Push Branch...", "Push..." | ||
|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Matthias Sohn <matthias.sohn> |
| Component: | Core | Assignee: | Robin Stocker <robin> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | major | ||
| Priority: | P3 | CC: | angvoz.dev, caniszczyk, contact, dariusz.luksza, eclipse.sprigogin, eclipse, eclipse, frank.jakop, gunnar, guo9310, iso.poczta, jamesblackburn+eclipse, jens.baumgart, karenfbutzke, leachbj, marc.khouzam, mn, nolan.lawson, robert.munteanu, robin, sbernard, sgehwolf, stefan.lay, wrobel.przemyslaw |
| Version: | 1.0 | ||
| Target Milestone: | 2.2 | ||
| Hardware: | All | ||
| OS: | All | ||
| Whiteboard: | |||
| Bug Depends on: | |||
| Bug Blocks: | 317371, 328138 | ||
|
Description
Matthias Sohn
confirm this bug. i have to fetch again after every push, to ensure the origin/master branch updated. We also came across this bug after fixing another (bug 317389 "Can't connect to any URI"). After a local commit, pushing to the remote host does not seem to update local repository (although the push does work correctly on the remote). That is, the local branch thinks it's ahead of origin by 1 commit, when in fact it is at the same level. A fetch from the Eclipse corrects this problem, as described by Matthias. By contrast, a push to the remote master from the command line using the system's git command works correctly, and the history in Eclipse is updated straight away. Eclipse Helios version 1.3.0.20100617-0520 eGit version 0.8.4 jGit version 0.8.4 I can also confirm that this problem also exists on the latest nightly build as of 2010-07-12. Of course, I could be doing something wrong :-) eGit version 0.9.0.201007091513 jGit version 0.9.0.201007090918 *** Bug 334031 has been marked as a duplicate of this bug. *** Bumping issue severity This really isn't just a Windows XP bug :) I'm on Fedora. *** Bug 333618 has been marked as a duplicate of this bug. *** *** Bug 337329 has been marked as a duplicate of this bug. *** I can confirm this is still happening with JGit version 0.12.0.201102282021. After some investigation, I can say that the problem is not in JGit. JGit updates the tracking branch just fine if you hand it the remote name (e.g. "origin") on push. I have a successful test case for PushCommand (will upload to Gerrit). The problem is in EGit, which only hands the URI to the PushCommand. This can be seen in PushOperation, which only gets URIishes from the PushOperationSpecification that is passed to it. I have a local change which changes the URIish to String in PushOperationSpecification, thus allowing it to contain a remote name. It works, but it's pretty hacky at this point. The component of this bug should be changed to EGit, see this commit: http://egit.eclipse.org/w/?p=jgit.git;a=commit;h=4fb185ab67bcea83c16855fc7e777faeb25ffd60 moving this to EGit as Robin suggested We're seeing this problem every time we push to the CDT eclipse.org git repo. I'm on Linux. It is kind of annoying, although not blocking. Fix proposed: http://egit.eclipse.org/r/#change,3817 merged as c6dd6790970fd5a030490260f4574585637a41cf *** Bug 353286 has been marked as a duplicate of this bug. *** The target milestone should be corrected to reduce confusion. This fix is not in 1.0 . this bug is back in indigo sr2. just updated yesterday. I'm also seeing it in EGit 2.0.0.201202261814. forgot to mention my version details. i have Eclipse EGit 1.3.0.201202151440-r org.eclipse.egit.feature.group Eclipse EGit from indigo sr2. [Batch change] Remove passed Target Milestones If anyone on CC list is going to fix/implement this, feel free to assign a new, post-1.3/2.0, target milestone. What is a status of this issue ? Are there plans to fix this bug ? Just to clarify: When using "Push to Upstream" from the team menu or the toolbar, it works (I'm using this every day). So the remaining problem is that it does not work when pushing from the Synchronize view. Fix for that pushed to review: https://git.eclipse.org/r/8940 It does not work when right-clicking on a branch in the 'Git Repositories' view and using 'Push Branch...'. I always then have to do 'Fetch from Upstream' (In reply to comment #23) > Just to clarify: When using "Push to Upstream" from the team menu or the > toolbar, it works (I'm using this every day). It doesn't work when using "Push..." command from the context menu of the Git Repositories view. Thanks for the feedback, pushed changes to review for also fixing these: (In reply to comment #24) > It does not work when right-clicking on a branch in the 'Git Repositories' > view and using 'Push Branch...'. I always then have to do 'Fetch from > Upstream' https://git.eclipse.org/r/8950 (In reply to comment #25) > It doesn't work when using "Push..." command from the context menu of the > Git Repositories view. https://git.eclipse.org/r/8951 *** Bug 395556 has been marked as a duplicate of this bug. *** fix merged as commit 5fdb4e38c515f0ecce546b9267e8c349c0cf0cff All 3 changes were merged into 2.2: http://git.eclipse.org/c/egit/egit.git/commit/?h=stable-2.2&id=1afed28c44cfaa632bf4b9f0361f1ee4d4d0bdbb |