chiark / gitweb /
Stop recording branch.*.remote to '.' for local parents.
authorYann Dirson <ydirson@altern.org>
Tue, 15 May 2007 17:09:57 +0000 (18:09 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 15 May 2007 21:13:14 +0000 (22:13 +0100)
commit1fa161d61e1020f534b25c7db94cbd28c836791f
tree48976264ed772d8c4bbe23a11dadbd182b602167
parent6018404959979ae130d3f5790a14975689b5b824
Stop recording branch.*.remote to '.' for local parents.

We should be using the remote name of the remote branch in
branch.*.merge, instead of the local one as we currently do (I'll
ensure this in a later patch).

As a consequence, setting "remote" to '.' and "merge" to the name of a
*local* parent would become inconsistent with the remote case.  Anyway
the local case should make use of pull-policy=rebase instead, and this
change revealed that we were fetching useless information in the local
case (no need for a remote).

Signed-off-by: Yann Dirson <ydirson@altern.org>
stgit/commands/pull.py
stgit/stack.py