Skip to content

Commit 501d80c

Browse files
committed
Fix #759: Update .git_archival.txt templates to more closely match how we invoke git-describe
This covers `--tags` and `--match '*[0-9]*'` (and `--dirty` is unnecessary). There is unfortunately no format-string equivalent to git-describe's `--long` option, Archives made from this repository after this change should now get versioned correctly. Fixes: #759
1 parent 4c2cf6e commit 501d80c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.git_archival.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node: $Format:%H$
22
node-date: $Format:%cI$
3-
describe-name: $Format:%(describe)$
3+
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
44
ref-names: $Format:%D$

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ and copy-paste this into it::
316316

317317
node: $Format:%H$
318318
node-date: $Format:%cI$
319-
describe-name: $Format:%(describe:tags=true)$
319+
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
320320
ref-names: $Format:%D$
321321

322322
Create the ``.gitattributes`` file in the root directory of your repository
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node: $Format:%H$
22
node-date: $Format:%cI$
3-
describe-name: $Format:%(describe)$
3+
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
44
ref-names: $Format:%D$

0 commit comments

Comments
 (0)