On 01/02/07, Yann Dirson <ydirson@xxxxxxxxxx> wrote:
Previously we were just assuming that the remote from which we just failed defined a local branch whose name was the same as the remote def, and that this branch was the parent. While this is true for the most common case (branch "origin" from remote "origin"), it is quite an unflexible assumption.
The t1200-push-modified.sh test fails after applying this patch. It looks like the 3rd test fails to pull the changes from 'foo' into 'bar'. Thanks. -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html