So summary, AFAICS: I was right in what was going on, but the "official" script doesn't do this because it does a "git fetch" at the start, thus updating all the remote branches.
Once it's done this, it then does "pull" for develop and master, which means looking at them in the upstream repo again for no particular reason...
Proposal: In the official script, change lines of the form "git pull --ff-only dreamwidth develop" to the form "git merge --ff-only remotes/dreamwidth/develop".
I've just tried this (with dreamwidth substituted with upstream for my setup) and it seems to work, and it should mean hitting github less often.
Also, the "git fetch" should probably be changed to "git fetch -p" so that any branches removed from the dreamwidth github repo are also removed locally.
Asking here rather than just changing it in the wiki it in case there's a reason not to :-)
no subject
I was right in what was going on, but the "official" script doesn't do this because it does a "git fetch" at the start, thus updating all the remote branches.
Once it's done this, it then does "pull" for develop and master, which means looking at them in the upstream repo again for no particular reason...
Proposal: In the official script, change lines of the form
"git pull --ff-only dreamwidth develop"
to the form
"git merge --ff-only remotes/dreamwidth/develop".
I've just tried this (with dreamwidth substituted with upstream for my setup) and it seems to work, and it should mean hitting github less often.
Also, the "git fetch" should probably be changed to "git fetch -p" so that any branches removed from the dreamwidth github repo are also removed locally.
Asking here rather than just changing it in the wiki it in case there's a reason not to :-)