[Sorry for the previous buggy post] In the previous series, patch 7 mostly demonstrate that I have missed the appearance of the --merged flag in stgit 0.9 push and pull commands, so we could just amend this testcase with that flag. However, it appears that common workflow of forgetting that flag, then trying to undo the failed push, and re-pushing with the flag still shows a problem, as hopefully shown by this updated testcase. As for the testcase in patch 8, it still demonstrates a problem IMHO: the push without the --merged flag should have failed in much the same way this one does. However, I have seen GNU patch showing a similar behaviour, so it is maybe not stgit's fault. -- Yann Dirson <ydirson@xxxxxxxxxx> | Debian-related: <dirson@xxxxxxxxxx> | Support Debian GNU/Linux: | Freedom, Power, Stability, Gratis http://ydirson.free.fr/ | Check <http://www.debian.org/> - : 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