Jeff King wrote: > On Fri, Dec 12, 2008 at 05:20:07PM -0600, Brandon Casey wrote: > >> Make it easier to recover from a mistaken branch deletion by displaying the >> sha1 of the branch's tip commit. > > This version looks fine to me, but one nit: > >> - test "$(git branch -d my7 2>&1)" = "Deleted branch my7."' >> + sha1=$(git rev-parse my7 | cut -c 1-7) && >> + test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."' > > There is a very very small chance that this sha1 might require more > than 7 characters to be unique (small because we have such a tiny number > of objects in the trash repo). Yeah I was counting on the smallness of that chance to let me be lazy and not think about how to get the proper abbreviated sha1. > Maybe: > > sha1=$(git log --pretty=format:%h -1 my7) > > is better (though I have to admit, if I were writing the test originally > I would have tested the exit value of "git branch" instead of the > message). My feelings won't be hurt if you want to change it. -brandon -- 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
