swaldman: A cute fluffy sheep curled up dreaming of Dreamwidth. Labelled "Simon: Bodger". (dw-dev)
Simon ([personal profile] swaldman) wrote in [site community profile] dw_dev2013-09-07 06:01 pm
Entry tags:

Your branch is ahead of 'upstream/develop' by 540 commits.

~/dw (develop)$ git status
# On branch develop
# Your branch is ahead of 'upstream/develop' by 540 commits.

Did we ever figure out what causes this? I have a theory, but I don't really understand...

(Theory: the dwu script does "git pull --ff-only upstream develop" straight from the remote repo into the local develop branch. This doesn't update the local copy of "remotes/upstream/develop" that was created by a "git fetch" sometime in the past. This is what the current branch is being compared to. I have no idea whether this makes sense, and if so how to deal with it...)
kareila: Taking refuge from falling debris under a computer desk. (computercrash)

[personal profile] kareila 2013-09-07 05:55 pm (UTC)(link)
I'm not sure your theory is correct, but if it is, then I think typing "git fetch upstream" would bring it back into sync. That's weird though, because I thought doing a pull included fetching.

Is your upstream remote the canonical DW repo, or your fork of it? If it's your fork, you'll occasionally need to pull from the former and push back to the latter to keep them in sync. I don't use the "dwu" script so I have no idea if or how it handles that situation, but that might be what's going on?