Also use lightweight tags in the Refs line of the diff view

Closes #1235
jonas · Oct 29, 2023 · 8ec2597 · 8ec2597
1 parent 411d37f
commit 8ec2597
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/diff.c b/src/diff.c
@@ -545,7 +545,7 @@ diff_read(struct view *view, struct buffer *buf, bool force_stop)
 		diff_restore_line(view, state);
 
 		if (!state->adding_describe_ref && !ref_list_contains_tag(view->vid)) {
-			const char *describe_argv[] = { "git", "describe", view->vid, NULL };
+			const char *describe_argv[] = { "git", "describe", "--tags", view->vid, NULL };
 			enum status_code code = begin_update(view, NULL, describe_argv, OPEN_EXTRA);
 
 			if (code != SUCCESS) {

diff --git a/test/main/mailmap-test b/test/main/mailmap-test
@@ -50,7 +50,7 @@ EOF
 
 assert_equals 'mailmapped-diff.screen' <<EOF
 commit 5cb3412a5e06e506840495b91acc885037a48b72
-Refs: [master], {origin/master}, {origin/HEAD}
+Refs: [master], {origin/master}, {origin/HEAD}, v1.0-13-g5cb3412
 Author:     Full Throttle <[email protected]>
 AuthorDate: Wed Apr 7 05:37:40 2010 +0000
 Commit:     ¯\_(ツ)_/¯ <[email protected]>

diff --git a/test/main/view-split-test b/test/main/view-split-test
@@ -50,7 +50,7 @@ EOF
 
 assert_equals 'main-vsplit-25-75.screen' <<EOF
 2010-04-07 05:37 +0 |commit 5cb3412a5e06e506840495b91acc885037a48b72
-2010-03-29 17:15 +0 |Refs: [master], {origin/master}, {origin/HEAD}
+2010-03-29 17:15 +0 |Refs: [master], {origin/master}, {origin/HEAD}, v1.0-13-g5c
 2010-03-21 04:53 +0 |Author:     Max Power <[email protected]>
 2010-03-12 16:31 +0 |AuthorDate: Wed Apr 7 05:37:40 2010 +0000
 2010-03-04 04:09 +0 |Commit:     Committer <[email protected]>
@@ -76,7 +76,7 @@ assert_equals 'main-hsplit-default.screen' <<EOF
 2010-03-04 04:09 +0000 A. U. Thor            o Commit 10 A
 [main] 5cb3412a5e06e506840495b91acc885037a48b72 - commit 1 of 50             10%
 commit 5cb3412a5e06e506840495b91acc885037a48b72
-Refs: [master], {origin/master}, {origin/HEAD}
+Refs: [master], {origin/master}, {origin/HEAD}, v1.0-13-g5cb3412
 Author:     Max Power <[email protected]>
 AuthorDate: Wed Apr 7 05:37:40 2010 +0000
 Commit:     Committer <[email protected]>
@@ -99,7 +99,7 @@ assert_equals 'main-hsplit-50-50.screen' <<EOF
 2010-02-06 15:02 +0000 作者                  o Commit 9 C
 [main] 5cb3412a5e06e506840495b91acc885037a48b72 - commit 1 of 50             16%
 commit 5cb3412a5e06e506840495b91acc885037a48b72
-Refs: [master], {origin/master}, {origin/HEAD}
+Refs: [master], {origin/master}, {origin/HEAD}, v1.0-13-g5cb3412
 Author:     Max Power <[email protected]>
 AuthorDate: Wed Apr 7 05:37:40 2010 +0000
 Commit:     Committer <[email protected]>

diff --git a/test/regressions/github-434-test b/test/regressions/github-434-test
@@ -28,7 +28,7 @@ test_tig
 
 assert_equals 'vsplit-auto.screen' <<EOF
 2010-04-07 05:37 +0000 Max Power             o [master] {origin/master} {origin/|commit 5cb3412a5e06e506840495b91acc885037a48b72
-2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D                      |Refs: [master], {origin/master}, {origin/HEAD}
+2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D                      |Refs: [master], {origin/master}, {origin/HEAD}, v1.0-13-g5cb3412
 2010-03-21 04:53 +0000 作者                  o Commit 10 C                      |Author:     Max Power <[email protected]>
 2010-03-12 16:31 +0000 René Lévesque         o Commit 10 B                      |AuthorDate: Wed Apr 7 05:37:40 2010 +0000
 2010-03-04 04:09 +0000 A. U. Thor            o Commit 10 A                      |Commit:     Committer <[email protected]>