From: Santi Béjar Date: Sat, 06 Jun 2009 08:00:18 GMT Subject: Re: [PATCH 2/3] pull --rebase: Add support for rebased default upstream Message-ID: In-Reply-To: 2009/6/6 Johannes Schindelin : > Hi, > > On Fri, 5 Jun 2009, Santi Béjar wrote: > >> Also add a test to check for this case and another one (failing) to >> test rebasing two branches on top of a rebased upstream using just >> 'git pull --rebase'. >> >> Signed-off-by: Santi Béjar > > Either I am a stupid moron (which is a completely valid suggestion) or > this commit message lacks in detail severely. > > For example, when I "git pull --rebase junio next" and "next" was rebased, > it works _perfectly_, so I do not see any need for a fix. It is for the default upstream (with no arguments), so before this patch: git pull --rebase did not work with a rebased upstream. But you are right, the commit message can be improved a lot. I've redone this patch series so much that at the end the commit message lack details. > > Further, this: > >> --- >>  git-parse-remote.sh |    8 +++++++- >>  t/t5520-pull.sh     |   29 +++++++++++++++++++++++++++++ >>  2 files changed, 36 insertions(+), 1 deletions(-) > > ... suggests to me that pull --rebase is not even affected by your patch. It modifies a function used in git pull --rebase. > So maybe you want to clarify so much that even stupid morons understand > what you want to achieve, and how. OK, I'll try. parse-remote: support default reflist in get_remote_merge_branch Expand get_remote_merge_branch to compute the tracking branch to merge when called without arguments (or only the remote name). This allows "git pull --rebase" without arguments (default upstream branch) to work with a rebased upstream. Santi