Thanks for this rather long answer,
On 12/12/2011 09:09 AM, Junio C Hamano wrote:
> Gelonida N <gelonida@xxxxxxxxx> writes:
>
>> What is the best way to fastforward all fastforwardable tracking
>> branches after a git fetch?
>
> This lacks context and invites too many tangents, so I'll only touch a few
> of them.
>
> First of all, why do you want to do this?
>
To explain the scenario:
- small project
- every person works on master and multiple topic branches
and might alternate rather often
- sometimes several persons work on the same topic branch
but most of the time not in parallel.
- one person is working from several machines (starting work on
one and continuing on another)
- additionally we do many pushed in order to be sure,
that our data is backed up in case of disk failures.
- sometimes I just want to 'build' from a branch, that I am not
working on. but there I create mostly not even a tracking branch
before changing a machine I want to be sure to have pushed everything. I
wanted to get rid of the warning, that some branches cannot be pushed,
because they aren't fastforwarded
when checking out a branch I want to avoid, that I have to pull manually.
> In other words, wouldn't a post-checkout hook be a better place to do
> this kind of thing, perhaps like this (completely untested)?
>
> #!/bin/sh
> old=$1 new=$2 kind=$3
>
> # did we checkout a branch?
> test "$kind" = 1 || exit 0
>
> # what did we check out?
> branch=$(git symbolic-ref HEAD 2>/dev/null) || exit 0
>
> # does it track anything? otherwise nothing needs to be done
> upstream=$(git for-each-ref --format='%(upstream)' "$branch")
> test -z "$upstream" || exit 0
>
> # are we up-to-date? if so no need to do anything
> test 0 = $(git rev-list "..$upstream" | wc -l) && exit 0
>
> # do we have something we made? if so no point trying to fast-forward
> test 0 = $(git rev-list "$upstream.." | wc -l) || exit 0
>
> # attempt a fast-forward merge with it
> git merge --ff-only @{upstream}
>
This is a solution, I wouldn't get rid of the warnings though when
running git push.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html