if you're using gerrit then you have the Change-Id trailer you can match against?