... | ... |
@@ -1,11 +1,11 @@ |
1 |
-Apply this patch to '_version.py' to get Miniver to calculate |
|
2 |
-the version using unannotated tags in addition to annotated tags |
|
3 |
-@@ -75,7 +75,7 @@ def get_version_from_git(): |
|
4 |
- for opts in [['--first-parent'], []]: |
|
1 |
+Apply this patch to "_version.py" to get Miniver to calculate the |
|
2 |
+version using unannotated tags in addition to annotated tags. |
|
3 |
+@@ -86,7 +86,7 @@ def get_version_from_git(): |
|
4 |
+ for opts in [["--first-parent"], []]: |
|
5 | 5 |
try: |
6 | 6 |
p = subprocess.Popen( |
7 |
-- ['git', 'describe', '--long', '--always'] + opts, |
|
8 |
-+ ['git', 'describe', '--long', '--always', '--tags'] + opts, |
|
7 |
+- ["git", "describe", "--long", "--always"] + opts, |
|
8 |
++ ["git", "describe", "--long", "--always", "--tags"] + opts, |
|
9 | 9 |
cwd=distr_root, |
10 |
- stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
|
11 |
- except OSError: |
|
10 |
+ stdout=subprocess.PIPE, |
|
11 |
+ stderr=subprocess.PIPE, |
We also add a patch that can be directly applied to '_version.py'
to make this change. This patch will need to be kept in sync
with '_version.py'.
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,11 @@ |
1 |
+Apply this patch to '_version.py' to get Miniver to calculate |
|
2 |
+the version using unannotated tags in addition to annotated tags |
|
3 |
+@@ -75,7 +75,7 @@ def get_version_from_git(): |
|
4 |
+ for opts in [['--first-parent'], []]: |
|
5 |
+ try: |
|
6 |
+ p = subprocess.Popen( |
|
7 |
+- ['git', 'describe', '--long', '--always'] + opts, |
|
8 |
++ ['git', 'describe', '--long', '--always', '--tags'] + opts, |
|
9 |
+ cwd=distr_root, |
|
10 |
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
|
11 |
+ except OSError: |