On Mon, 2009-09-07 at 21:25 -0500, Shaun McCance wrote: > So gnome-doc-utils has gotten itself a fairly wonky history > due to mistakes on my part. What happened is that I made > releases, tagged the release commits, and pushed the tags, > but I didn't push master. So the commits got pushed, but > origin/master wasn't updated. > > If you look at the history for gnome-doc-utils in giggle, > you can see the problem pretty clearly. > > I want origin/master to point to 0.17.5, or to something > that includes 0.17.5 in its history, but this doesn't seem > possible with our extra merge commits check. If I rebase > 0.17.5 on top of origin/master, I get bogus extra release > commits, but the signed release commits still aren't in > the history of origin/master. It's ugly. > > Since those commits are pushed and tagged, there's no way > history can be fixed now. The cleanest thing to do would > be to just make origin/master point to 0.17.5, but I can't > make this happen. Could a git admin make it so?
Done, using git push --exec=force <commit_id>:master (--exec=force is gitadmin only, though I wonder if some types of less dangerous check-bypasses should be forceable by everbody.) Filed: http://bugzilla.gnome.org/show_bug.cgi?id=594498 That we should try to catch your original problem and not allow pushing tags that don't point to some branch. - Owen For reference, the history of 0.17.5 was: * 8657db3 Version 0.17.5 * ccb3c48 Merge branch 'master' of ssh://git.gnome.org/git/gnome-doc-utils |\ | * 6574fa2 Updated Polish translation | * e4323bf Hungarian translation updated * | 435431f Merge branch 'master' of ssh://git.gnome.org/git/gnome-doc-utils |\ \ | |/ | * 3e0e1c3 Updated Turkish translation. * | 138c6d3 Merge branch 'master' of ssh://git.gnome.org/git/gnome-doc-utils |\ \ | |/ | * 41e8629 Updated Czech translation | * 9b6f132 Updated Traditional Chinese translation(Hong Kong and Taiwan) | * 381b5ef Updated Serbian translation | * a9ba4b0 [mal2html] Handle link roles on inline links | * ad336cf Updated Bengali India Translations | * 40cf497 Handle link roles for automatic links | * 9759ebe Updated Portuguese translation | * 22a47c0 Updated Basque language | * 8bb4650 Updated Gujarati Translations * | 82e172f Version 0.17.4 * | 7670ca2 [mallard] Fixed typo |/ * f966974 Updated Thai translation. * 44e5486 Updated German doc translation (git log --graph --pretty=format:'%h %s' 0.17.5) _______________________________________________ gnome-infrastructure mailing list [email protected] http://mail.gnome.org/mailman/listinfo/gnome-infrastructure
