chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1739d40) | patch
Better diagnostic for wrong branch configuration.
authorYann Dirson <ydirson@altern.org>
Fri, 5 Oct 2007 20:44:52 +0000 (22:44 +0200)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sun, 7 Oct 2007 21:01:04 +0000 (22:01 +0100)
commit764d110156e4951ca5671a700ee2402fa3597734
tree5308d9b01cb3f5b7c25a91b2e0a2407249e4eb55tree | snapshot
parent1739d40a569e64da30df01500162f93d28ee6d19commit | diff
Better diagnostic for wrong branch configuration.

If the branch.*.merge parameter does not name a valid remote head,
stgit would not rebase after a fetch, and would write instead
'Rebasing to "None" ... done'.

This patch makes this situation an error and tells the user what
to fix in his repo configuration.
stgit/commands/pull.py diff | blob | blame | history
stgit/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)