From: Larry D'Anna <hidden> Date: 2016-06-15 22:48:13
So say you have a project with a bunch of branches. You have two main computers
you work on: a laptop and a workstation, and you keep an authoritative copy on a
server somewhere. When you sit down at your laptop to work on your project, the
first thing you want to do is make sure that whatever you've got locally is
up-to-date with the repo on the server. So you run:
git push origin :
Then if it says anything isn't a fast-forward, you use some combination of git
pull, git checkout, or git fetch to get all you branches up to date, then
possibly you run the push again to push merges back to the server.
How about instead we add a new command called "git sync" that does all that for
you? So if you say
git sync origin :
It matches refs just like git-push would, but it will also automatically
fast-forward your local refs if possible. (and update the worktree+index if
HEAD is one of the local refs that gets fast forwarded). If any merges would
be required, it will print a warning and leave that ref alone.
And if you say
git sync --merge origin :
it will try to merge any refs that need it. If the merge succeeds, it will be
exactly as if you had said
git checkout foobranch
git pull origin foobranch
git push origin foobranch
What do you all think? If you like the idea, I'll do it as a builtin.
Otherwise I'll just hack up a perl script for myself.
--larry
From: Jakub Narebski <hidden> Date: 2016-06-15 22:48:13
Larry D'Anna [off-list ref] writes:
So say you have a project with a bunch of branches. You have two main computers
you work on: a laptop and a workstation, and you keep an authoritative copy on a
server somewhere. When you sit down at your laptop to work on your project, the
first thing you want to do is make sure that whatever you've got locally is
up-to-date with the repo on the server. So you run:
git push origin :
Then if it says anything isn't a fast-forward, you use some combination of git
pull, git checkout, or git fetch to get all you branches up to date, then
possibly you run the push again to push merges back to the server.
How about instead we add a new command called "git sync" that does all that for
you? So if you say
git sync origin :
[...]
What do you all think? If you like the idea, I'll do it as a builtin.
Otherwise I'll just hack up a perl script for myself.
Hi, to follow that recipe with more than one satellite, all sharing the same
config, it would be just great to be able to put $hostname in .git-config, e.g.
[remote "mothership"]
url = <url>
push = master:refs/remotes/$hostname/master
Would there be any potential problem with that?
Because that has nothing whatsoever to do with the problem I'm trying to solve.
I'm trying to make a common task more automated and convenient. It's not like I
don't know how to perform it manually.
--larry