On Aug 31, 2009, at 11:55 PM, David Schmitt wrote: > > Luke Kanies wrote: >> I've also got a 'git-cleanup-branch' script that cleans up things >> like this by looking through the git history to see if a given commit >> (as determined by its summary, rather than its commit, since that >> will change on a rebase) is merged, and if so removes the local and >> remote branches. 90% of its code is abstracting git into an OO >> interface, so it makes sense to start using the lib at that point. > > > Have a look at git-cherry: "Find commits not merged upstream": > >> Because git-cherry compares the changeset rather than the commit id >> (sha1), you can use git-cherry to find out if a commit you made >> locally has been applied <upstream> under a different commit id. For >> example, this will happen if you're feeding patches <upstream> via >> email rather than pushing or pulling commits directly. > > That might be more robust (and less code) than looking at the summary.
You're right, that seems a better choice. -- The people who are regarded as moral luminaries are those who forego ordinary pleasures themselves and find compensation in interfering with the pleasures of others. -- Bertrand Russell --------------------------------------------------------------------- Luke Kanies | http://reductivelabs.com | http://madstop.com --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
