From 7ae15b6c1929af96c04cb617fa02ec0ea7e63a76 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Sat, 8 Aug 2015 10:20:24 +0200 Subject: git-log-describe.awk: fix submodule case For submodules, the .git file is just a file, not a directory. --- git-log-describe.awk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-log-describe.awk b/git-log-describe.awk index 74d8e42..4f9d94e 100755 --- a/git-log-describe.awk +++ b/git-log-describe.awk @@ -21,17 +21,17 @@ # are changed (see variable "opts" below) or when a new tag is added before an # existing tag. # -# Copyright (c) 2013 Peter Wu +# Copyright (c) 2013-2015 Peter Wu # Licensed under GPLv3 or any latter version BEGIN { if (!cache_dir && cache) { # Use directory in .git/ as default. - cmd = "git rev-parse --show-toplevel"; + cmd = "git rev-parse --git-dir"; cmd | getline cache_dir; close(cmd); if (cache_dir) - cache_dir = cache_dir "/.git/describe-cache.d"; + cache_dir = cache_dir "/describe-cache.d"; } if (fast) { -- cgit v1.2.1