Eclipse Community Forums: EGit / JGit » origin/master toggles with each fetch

Help

Home

Home » Eclipse Projects » EGit / JGit » origin/master toggles with each fetch

Show: Today's Messages :: Show Polls :: Message Navigator

origin/master toggles with each fetch [message #1745025]

Tue, 04 October 2016 09:58

Tobias Hein

Messages: 3
Registered: January 2016

Junior Member

Hi everybody,

we have a strange state in one of our productive git-repositories when using egit/jgit.

When doing a fetch, the origin/master toggles between two commits (although, there were no changes). I attached screenshots of our history.

index.php/fa/27291/0/

After merging some more commits to the master, we have the same behaviour, but with another commit. I didn't find a systematic schema until now. Unfortunatally I cannot reproduce it in a small example repository.

Can please anybody help me to analyze/understand the state and find a solution. Even asking questions to me would help me.

What I found out:
- It happens in exactly one of our repositories
- It happens in all local clones of this repository
- It happens only when using egit/jgit. With the command line client[1] everything is ok
- It happens with the current egit/jgit and with older releases (shipped with eclipse luna)

What we changed:
- We updated from eclipse luna to eclipse neon => also newer egit/jgit
- At the same time, one of us used "rebase (interactive)". This was about 50 commits ago. This was not used anymore in the last 30 commits and in the last 3 merges to the master.

My questions are:

- What happens? What is our current state? Why does the origin/master toggle?
- How did we get into this state?
- How can we resolve this state?

[1] git-scm.com/downloads

Attachment: git-toggle1.jpg
(Size: 17.53KB, Downloaded 191 times)
Attachment: git-toggle2.jpg
(Size: 17.56KB, Downloaded 188 times)

Report message to a moderator

Re: origin/master toggles with each fetch [message #1745373 is a reply to message #1745025]

Sat, 08 October 2016 20:06

Dominic Cerisano

Messages: 7
Registered: October 2016

Junior Member

This is likely related to this issue:
https://www.eclipse.org/forums/index.php/t/1081631/

The recommend is to try to back off to Neon.0

Report message to a moderator

Re: origin/master toggles with each fetch [message #1745443 is a reply to message #1745373]

Mon, 10 October 2016 18:35

Ed Merks

Messages: 28768
Registered: July 2009

Senior Member

Note that Neon.1a with the fix for this problem is goes live tomorrow at 10:00AM Eastern Daylight Time, North America.

Report message to a moderator

Re: origin/master toggles with each fetch [message #1745541 is a reply to message #1745443]

Wed, 12 October 2016 10:15

Tobias Hein

Messages: 3
Registered: January 2016

Junior Member

It was worth a try, because we use the https-protocol for the communication. But unfortunatally using another eclipse-version is not the solution. We have the same problem with neon.0 and neon.1a. We also have it with luna, which we used before. Or do I have to delete some files, that were used by all eclipse installations?

I think, it has also something to do with an internal state of the repository, because we have this problem only with one of our repositories in combination with egit/jgit in different versions. But I have no idea, where to start with the analysis.

For now I try to find out, what these "problematic" commits have in common. Maybe this gives a hint.

Report message to a moderator

Re: origin/master toggles with each fetch [message #1746423 is a reply to message #1745541]

Fri, 28 October 2016 13:26

Matthias Sohn

Messages: 944
Registered: July 2009

Senior Member

- do you use multiple remotes pointing to different URLs ?
- how do the refspecs for the existing remotes look like (find that in .git/config, typically there is one section [remote "origin"] for the default remote "origin")
- how exactly do you fetch ?
- can you try to fetch using "Team > Remote > Fetch From..." using Source ref "refs/heads/*" and target ref "refs/remotes/origin/*"
- you can trace the http protocol traffic using mitmproxy [1], if you are using https read [2]

[1] https://mitmproxy.org/
[2] http://docs.mitmproxy.org/en/latest/certinstall.html

Report message to a moderator

Re: origin/master toggles with each fetch [message #1746424 is a reply to message #1746423]

Fri, 28 October 2016 13:29

Matthias Sohn

Messages: 944
Registered: July 2009

Senior Member

do you see the same problem when cloning the same repository to another machine ?

Report message to a moderator

Re: origin/master toggles with each fetch [message #1748892 is a reply to message #1745025]

Tue, 29 November 2016 19:46

Tobias Hein

Messages: 3
Registered: January 2016

Junior Member

Sorry, I didn't recognize that there were answers. Thanks for your replies.

Today we solved the problem. In the central repository there was an additional branch(?) called HEAD (see screenshot). After deleting it, everything was solved.

We don't know, how this happened, but at least we know how to solve it in the future.

index.php/fa/27728/0/

Attachment: duplicated_HEAD.jpg
(Size: 9.20KB, Downloaded 81 times)

[Updated on: Tue, 29 November 2016 19:47]

Report message to a moderator

Previous Topic:	new Mercurial client?
Next Topic:	folder ignored in submodule appears as tracked

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Mon Sep 25 16:58:03 GMT 2017

.:: Contact :: Home ::.