| commit | 8b9feb3cec3bf2b48127528544e4e518150a2101 | |
| author | Yann Dirson <ydirson@altern.org> | |
| Fri, 5 Oct 2007 20:43:39 +0000 (5 22:43 +0200) | ||
| committer | Yann Dirson <ydirson@altern.org> | |
| Fri, 5 Oct 2007 20:43:39 +0000 (5 22:43 +0200) | ||
| tree | 5b48f8ea73c5eeb4c0076df6cf72e2875b311129 | treesnapshot (tar.gz zip) |
| parent | 2ae14c0a0724e0575f69751264b7da422e9940a6 | commitdiff |
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.
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 | diffblobblamehistory | |
| stgit/git.py | diffblobblamehistory |