[PATCH] sha1_name: accept output of git-describe
Now, 'git log $(git describe)' does the same as 'git log'.
NOTE: it might be possible that the unique abbreviation generated by
git-describe is no longer unique at a later stage. Evidently, in this
case the sha1 resolution fails.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
sha1_name.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index b497528..c1f6cca 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -159,6 +159,18 @@ static int get_short_sha1(const char *na
if (len < MINIMUM_ABBREV)
return -1;
+
+ /* check for output of git-describe */
+ if (len > MINIMUM_ABBREV + 2) {
+ int i;
+ for (i = len - MINIMUM_ABBREV - 2; i > 0 && name[i] != '-'; i--)
+ ; /* do nothing */
+ if (i > 0 && name[i + 1] == 'g') {
+ name += i + 2;
+ len -= i + 2;
+ }
+ }
+
hashclr(res);
memset(canonical, 'x', 40);
for (i = 0; i < len ;i++) {
--
1.4.2.1.ga0df5-dirty
Johannes Schindelin <johannes.schindelin@gmx.de>