diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-08-08 10:20:24 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2015-08-08 10:20:24 +0200 |
| commit | 7ae15b6c1929af96c04cb617fa02ec0ea7e63a76 (patch) | |
| tree | b8285fb9d57ce51ba5c22452c8832e65d0876d9e | |
| parent | 9bb65586f6f8e4a2ba2da23feb4ee8b224e45491 (diff) | |
| download | scripts-7ae15b6c1929af96c04cb617fa02ec0ea7e63a76.tar.gz | |
git-log-describe.awk: fix submodule case
For submodules, the .git file is just a file, not a directory.
| -rwxr-xr-x | git-log-describe.awk | 6 |
1 files 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 <lekensteyn@gmail.com> +# Copyright (c) 2013-2015 Peter Wu <peter@lekensteyn.nl> # 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) { |