Hi,
On Thu, 16 Jul 2009, Santi Béjar wrote:
> Use the fork commit of the current branch (where
> the tip of upstream branch used to be) as the upstream parameter of
> "git rebase". Compute it walking the reflog to find the first commit
> which is an ancestor of the current branch.
I finally understand what this patch is about. Thanks.
> diff --git a/git-pull.sh b/git-pull.sh
> index 4b78a0c..31d3945 100755
> --- a/git-pull.sh
> +++ b/git-pull.sh
> @@ -125,9 +125,14 @@ test true = "$rebase" && {
> die "refusing to pull with rebase: your working tree is not up-to-date"
>
> . git-parse-remote &&
> - reflist="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
> - oldremoteref="$(git rev-parse -q --verify \
> - "$reflist")"
> + remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
> + num=0 &&
> + while oldremoteref="$(git rev-parse -q --verify "$remoteref@{$num}")"
> + do
How about
oldremoteref="$(git rev-list --boundary HEAD --not \
$(git rev-list -g $remoteref | sed 's/$/^@/') |
sed -e '/^[^-]/d' -e q)"
Explanation: the "git rev-list -g $remoteref" lists the previous commits
the remote ref pointed to, and the ^@ appended to them means all their
parents. Now, the outer rev-list says to take everything in HEAD but
_not_ in those parents, showing the boundary commits. The "sed" call
lists the first such boundary commit (which must, by construction, be one
of the commits shown by the first rev-list).
But maybe this is trying to be too clever, and we should not bother with
it until git-pull is made a builtin?
Ciao,
Dscho