Skip to content

Commit 4b905e4

Browse files
yujayuja
committed
templates: remove git_head() from default and test templates
git_head() will be deprecated soon.
1 parent 2f9020a commit 4b905e4

File tree

6 files changed

+58
-64
lines changed

6 files changed

+58
-64
lines changed

‎cli/src/config/templates.toml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ if(commit.root(),
173173
commit.bookmarks(),
174174
commit.tags(),
175175
commit.working_copies(),
176-
if(commit.git_head(), label("git_head", "git_head()")),
177176
format_short_commit_id(commit.commit_id()),
178177
if(commit.conflict(), label("conflict", "conflict")),
179178
if(config("ui.show-cryptographic-signatures").as_boolean(),
@@ -485,7 +484,6 @@ separate(" ",
485484
commit.bookmarks(),
486485
commit.tags(),
487486
commit.working_copies(),
488-
if(commit.git_head(), label("git_head", "git_head()")),
489487
format_short_commit_id(commit.commit_id()),
490488
if(commit.conflict(), label("conflict", "conflict")),
491489
if(config("ui.show-cryptographic-signatures").as_boolean(),
@@ -511,7 +509,6 @@ separate(" ",
511509
)),
512510
commit.tags().map(|tag| concat("tag-", hash(tag.name()).substr(0, 4))),
513511
commit.working_copies(),
514-
if(commit.git_head(), label("git_head", "git_head()")),
515512
format_short_commit_id(commit.commit_id()),
516513
if(commit.conflict(), label("conflict", "conflict")),
517514
if(config("ui.show-cryptographic-signatures").as_boolean(),

‎cli/tests/test_commit_template.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ fn test_log_git_head() {
801801
insta::assert_snapshot!(output, @r"
802802
@ rlvkpnrz [38;5;[email protected] 2001-02-03 08:05:09 687fadfd
803803
│ initial
804-
○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;[email protected][39m [38;5;6m2001-02-03 08:05:07[39m [38;5;2mgit_head()[39m [1m[38;5;4me[0m[38;5;8m8849ae1[39m
804+
○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;[email protected][39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4me[0m[38;5;8m8849ae1[39m
805805
│ (empty) (no description set)
806806
◆ zzzzzzzz root() 00000000
807807
[EOF]

‎cli/tests/test_git_colocated.rs‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn test_git_colocated() {
5050
.success();
5151
insta::assert_snapshot!(get_log_output(&work_dir), @r"
5252
@ 524826059adc6f74de30f6be8f8eb86715d75b62
53-
○ 97358f54806c7cd005ed5ade68a779595efbae7e master git_head() initial
53+
○ 97358f54806c7cd005ed5ade68a779595efbae7e master initial
5454
◆ 0000000000000000000000000000000000000000
5555
[EOF]
5656
");
@@ -69,7 +69,7 @@ fn test_git_colocated() {
6969
work_dir.write_file("file", "modified");
7070
insta::assert_snapshot!(get_log_output(&work_dir), @r"
7171
@ 9dfe8c7005c8dff6078ecdfd953c6bfddc633c90
72-
○ 97358f54806c7cd005ed5ade68a779595efbae7e master git_head() initial
72+
○ 97358f54806c7cd005ed5ade68a779595efbae7e master initial
7373
◆ 0000000000000000000000000000000000000000
7474
[EOF]
7575
");
@@ -87,7 +87,7 @@ fn test_git_colocated() {
8787
work_dir.run_jj(["new"]).success();
8888
insta::assert_snapshot!(get_log_output(&work_dir), @r"
8989
@ 4ddddef596e9d68f729f1be9e1b2cdaaf45bef08
90-
○ 9dfe8c7005c8dff6078ecdfd953c6bfddc633c90 git_head()
90+
○ 9dfe8c7005c8dff6078ecdfd953c6bfddc633c90
9191
○ 97358f54806c7cd005ed5ade68a779595efbae7e master initial
9292
◆ 0000000000000000000000000000000000000000
9393
[EOF]
@@ -269,7 +269,7 @@ fn test_git_colocated_unborn_bookmark() {
269269
);
270270
insta::assert_snapshot!(get_log_output(&work_dir), @r"
271271
@ 2d7a8abb601ebf559df4037279e9f2e851a75e63
272-
○ ff5366846b039b25c6c4998fa74dca821c246243 git_head()
272+
○ ff5366846b039b25c6c4998fa74dca821c246243
273273
│ ○ e6669bb3438ef218fa618e1047a1911d2b3410dd
274274
├─╯
275275
◆ 0000000000000000000000000000000000000000
@@ -341,7 +341,7 @@ fn test_git_colocated_unborn_bookmark() {
341341
");
342342
insta::assert_snapshot!(get_log_output(&work_dir), @r"
343343
@ 2fb16499a987e632407402e38976ed250c939c42
344-
○ bb21bc2dce2af92973fdd6d42686d77bd16bc466 git_head()
344+
○ bb21bc2dce2af92973fdd6d42686d77bd16bc466
345345
│ ○ 2dd7385602e703388fd266b939bba6f57a1439d3
346346
│ ○ ff5366846b039b25c6c4998fa74dca821c246243 master
347347
├─╯
@@ -437,7 +437,7 @@ fn test_git_colocated_rebase_on_import() {
437437
.unwrap();
438438
insta::assert_snapshot!(get_log_output(&work_dir), @r"
439439
@ d46583362b91d0e172aec469ea1689995540de81
440-
○ cbd6c887108743a4abb0919305646a6a914a665e master git_head() add a file
440+
○ cbd6c887108743a4abb0919305646a6a914a665e master add a file
441441
◆ 0000000000000000000000000000000000000000
442442
[EOF]
443443
------- stderr -------
@@ -465,7 +465,7 @@ fn test_git_colocated_bookmarks() {
465465
@ 95e79774f8e7c785fc36da2b798ecfe0dc864e02 bar
466466
│ ○ b51ab2e2c88fe2d38bd7ca6946c4d87f281ce7e2 foo
467467
├─╯
468-
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
468+
○ e8849ae12c709f2321908879bc724fdb2ab8a781
469469
◆ 0000000000000000000000000000000000000000
470470
[EOF]
471471
");
@@ -503,7 +503,7 @@ fn test_git_colocated_bookmarks() {
503503
@ 507c0edcfc028f714f3c7a3027cb141f6610e867
504504
│ ○ b51ab2e2c88fe2d38bd7ca6946c4d87f281ce7e2 master foo
505505
├─╯
506-
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
506+
○ e8849ae12c709f2321908879bc724fdb2ab8a781
507507
◆ 0000000000000000000000000000000000000000
508508
[EOF]
509509
------- stderr -------
@@ -529,7 +529,7 @@ fn test_git_colocated_bookmark_forget() {
529529
.success();
530530
insta::assert_snapshot!(get_log_output(&work_dir), @r"
531531
@ 43444d88b0096888ebfd664c0cf792c9d15e3f14 foo
532-
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
532+
○ e8849ae12c709f2321908879bc724fdb2ab8a781
533533
◆ 0000000000000000000000000000000000000000
534534
[EOF]
535535
");
@@ -670,7 +670,7 @@ fn test_git_colocated_checkout_non_empty_working_copy() {
670670
@ 986aa548466ed43b48c059854720e70d8ec2bf71 new
671671
│ ○ 6b0f7d59e0749d3a6ff2ecf686d5fa48023b7b93 two
672672
├─╯
673-
○ 97358f54806c7cd005ed5ade68a779595efbae7e master git_head() initial
673+
○ 97358f54806c7cd005ed5ade68a779595efbae7e master initial
674674
◆ 0000000000000000000000000000000000000000
675675
[EOF]
676676
");
@@ -711,7 +711,7 @@ fn test_git_colocated_fetch_deleted_or_moved_bookmark() {
711711
├─╯
712712
│ ○ b2ea51c027e11c0f2871cce2a52e648e194df771 B_to_delete B_to_delete
713713
├─╯
714-
◆ 8777db25171cace71ad014598663d5ffc4fae6b1 A git_head() A
714+
◆ 8777db25171cace71ad014598663d5ffc4fae6b1 A A
715715
◆ 0000000000000000000000000000000000000000
716716
[EOF]
717717
");
@@ -737,7 +737,7 @@ fn test_git_colocated_fetch_deleted_or_moved_bookmark() {
737737
@ 0060713e4c7c46c4ce0d69a43ac16451582eda79
738738
│ ○ fb297975e4ef98dc057f65b761aed2cdb0386598 C_to_move moved C
739739
├─╯
740-
◆ 8777db25171cace71ad014598663d5ffc4fae6b1 A git_head() A
740+
◆ 8777db25171cace71ad014598663d5ffc4fae6b1 A A
741741
◆ 0000000000000000000000000000000000000000
742742
[EOF]
743743
");
@@ -785,7 +785,7 @@ fn test_git_colocated_rebase_dirty_working_copy() {
785785
");
786786
insta::assert_snapshot!(get_log_output(&work_dir), @r"
787787
@ e23559e3bc6f22a5562297696fc357e2c581df77 feature??
788-
○ f99015d7d9b82a5912ec4d96a18d2a4afbd8dd49 git_head()
788+
○ f99015d7d9b82a5912ec4d96a18d2a4afbd8dd49
789789
◆ 0000000000000000000000000000000000000000
790790
[EOF]
791791
");
@@ -820,7 +820,7 @@ fn test_git_colocated_external_checkout() {
820820
// Checked out anonymous bookmark
821821
insta::assert_snapshot!(get_log_output(&work_dir), @r"
822822
@ 6f8612f0e7f6d52efd8a72615796df06f8d64cdc
823-
○ 319eaafc8fd04c763a0683a000bba5452082feb3 git_head() B
823+
○ 319eaafc8fd04c763a0683a000bba5452082feb3 B
824824
│ ○ 8777db25171cace71ad014598663d5ffc4fae6b1 master A
825825
├─╯
826826
◆ 0000000000000000000000000000000000000000
@@ -834,7 +834,7 @@ fn test_git_colocated_external_checkout() {
834834
// be abandoned. (#1042)
835835
insta::assert_snapshot!(get_log_output(&work_dir), @r"
836836
@ 7ceeaaae54c8ac99ad34eeed7fe1e896f535be99
837-
○ 8777db25171cace71ad014598663d5ffc4fae6b1 master git_head() A
837+
○ 8777db25171cace71ad014598663d5ffc4fae6b1 master A
838838
│ ○ 319eaafc8fd04c763a0683a000bba5452082feb3 B
839839
├─╯
840840
◆ 0000000000000000000000000000000000000000
@@ -850,7 +850,7 @@ fn test_git_colocated_external_checkout() {
850850
insta::assert_snapshot!(get_log_output(&work_dir), @r"
851851
○ 823204bc895aad19d46b895bc510fb3e9d0c97c7 C
852852
@ c6abf242550b7c4116d3821b69c79326889aeba0
853-
○ 319eaafc8fd04c763a0683a000bba5452082feb3 git_head() B
853+
○ 319eaafc8fd04c763a0683a000bba5452082feb3 B
854854
│ ○ 8777db25171cace71ad014598663d5ffc4fae6b1 master A
855855
├─╯
856856
◆ 0000000000000000000000000000000000000000
@@ -863,7 +863,7 @@ fn test_git_colocated_external_checkout() {
863863
// The old working-copy commit shouldn't be abandoned. (#3747)
864864
insta::assert_snapshot!(get_log_output(&work_dir), @r"
865865
@ 277b693c61dcdea59ac26d6982370f78751f6ef5
866-
○ 8777db25171cace71ad014598663d5ffc4fae6b1 master git_head() A
866+
○ 8777db25171cace71ad014598663d5ffc4fae6b1 master A
867867
│ ○ 823204bc895aad19d46b895bc510fb3e9d0c97c7 C
868868
│ ○ c6abf242550b7c4116d3821b69c79326889aeba0
869869
│ ○ 319eaafc8fd04c763a0683a000bba5452082feb3 B
@@ -911,7 +911,7 @@ fn test_git_colocated_concurrent_checkout() {
911911
│ (empty) (no description set)
912912
○ zsuskuln [email protected] 2001-02-03 08:05:11 b6786455
913913
│ (empty) commit3
914-
○ kkmpptxz [email protected] 2001-02-03 08:05:10 git_head() dc0b92df
914+
○ kkmpptxz [email protected] 2001-02-03 08:05:10 dc0b92df
915915
│ commit2
916916
│ A file2
917917
○ rlvkpnrz [email protected] 2001-02-03 08:05:09 091e39fe
@@ -932,7 +932,7 @@ fn test_git_colocated_concurrent_checkout() {
932932
│ ○ kkmpptxz [email protected] 2001-02-03 08:05:10 dc0b92df
933933
├─╯ commit2
934934
│ A file2
935-
○ rlvkpnrz [email protected] 2001-02-03 08:05:09 git_head() 091e39fe
935+
○ rlvkpnrz [email protected] 2001-02-03 08:05:09 091e39fe
936936
│ commit1
937937
│ A file1
938938
○ qpvuntsm [email protected] 2001-02-03 08:05:07 e8849ae1
@@ -955,23 +955,23 @@ fn test_git_colocated_squash_undo() {
955955
// Test the setup
956956
insta::assert_snapshot!(get_log_output_divergence(&work_dir), @r"
957957
@ rlvkpnrzqnoo 682c866b0a2f
958-
○ qpvuntsmwlqt 8777db25171c A git_head()
958+
○ qpvuntsmwlqt 8777db25171c A
959959
◆ zzzzzzzzzzzz 000000000000
960960
[EOF]
961961
");
962962

963963
work_dir.run_jj(["squash"]).success();
964964
insta::assert_snapshot!(get_log_output_divergence(&work_dir), @r"
965965
@ zsuskulnrvyr e1c3034f23b9
966-
○ qpvuntsmwlqt ba304e200f4f A git_head()
966+
○ qpvuntsmwlqt ba304e200f4f A
967967
◆ zzzzzzzzzzzz 000000000000
968968
[EOF]
969969
");
970970
work_dir.run_jj(["undo"]).success();
971971
// There should be no divergence here (#922)
972972
insta::assert_snapshot!(get_log_output_divergence(&work_dir), @r"
973973
@ rlvkpnrzqnoo 682c866b0a2f
974-
○ qpvuntsmwlqt 8777db25171c A git_head()
974+
○ qpvuntsmwlqt 8777db25171c A
975975
◆ zzzzzzzzzzzz 000000000000
976976
[EOF]
977977
");
@@ -992,7 +992,7 @@ fn test_git_colocated_undo_head_move() {
992992
@"e8849ae12c709f2321908879bc724fdb2ab8a781");
993993
insta::assert_snapshot!(get_log_output(&work_dir), @r"
994994
@ 43444d88b0096888ebfd664c0cf792c9d15e3f14
995-
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
995+
○ e8849ae12c709f2321908879bc724fdb2ab8a781
996996
◆ 0000000000000000000000000000000000000000
997997
[EOF]
998998
");
@@ -1021,7 +1021,7 @@ fn test_git_colocated_undo_head_move() {
10211021
work_dir.run_jj(["new"]).success();
10221022
insta::assert_snapshot!(get_log_output(&work_dir), @r"
10231023
@ 5e37f1b8313299eb1b62221eefcf32881b0dc4c6
1024-
○ 23e6e06a7471634da3567ef975fadf883082658f git_head()
1024+
○ 23e6e06a7471634da3567ef975fadf883082658f
10251025
○ e8849ae12c709f2321908879bc724fdb2ab8a781
10261026
◆ 0000000000000000000000000000000000000000
10271027
[EOF]
@@ -1051,7 +1051,7 @@ fn test_git_colocated_undo_head_move() {
10511051
@"e8849ae12c709f2321908879bc724fdb2ab8a781");
10521052
insta::assert_snapshot!(get_log_output(&work_dir), @r"
10531053
@ 23e6e06a7471634da3567ef975fadf883082658f
1054-
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
1054+
○ e8849ae12c709f2321908879bc724fdb2ab8a781
10551055
◆ 0000000000000000000000000000000000000000
10561056
[EOF]
10571057
");
@@ -1090,7 +1090,7 @@ fn test_git_colocated_update_index_preserves_timestamps() {
10901090

10911091
insta::assert_snapshot!(get_log_output(&work_dir), @r"
10921092
@ a1886a45815f0dcca5cefcc334d11ffb908a1eb8
1093-
○ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2 git_head()
1093+
○ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2
10941094
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1
10951095
◆ 0000000000000000000000000000000000000000
10961096
[EOF]
@@ -1119,7 +1119,7 @@ fn test_git_colocated_update_index_preserves_timestamps() {
11191119

11201120
insta::assert_snapshot!(get_log_output(&work_dir), @r"
11211121
@ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2
1122-
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1 git_head()
1122+
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1
11231123
◆ 0000000000000000000000000000000000000000
11241124
[EOF]
11251125
");
@@ -1139,7 +1139,7 @@ fn test_git_colocated_update_index_preserves_timestamps() {
11391139
@ d9c7f1932e1135856d5905f1a0fc194ce2657065
11401140
│ ○ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2
11411141
├─╯
1142-
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1 git_head()
1142+
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1
11431143
◆ 0000000000000000000000000000000000000000
11441144
[EOF]
11451145
");
@@ -1203,7 +1203,7 @@ fn test_git_colocated_update_index_merge_conflict() {
12031203
@ 985fe3b46a6caecb44b6a12d22fc2b1fc33c219d
12041204
├─╮
12051205
│ ○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
1206-
○ │ d0f55ffafa1e0e72980202c349af23d093f825be left git_head()
1206+
○ │ d0f55ffafa1e0e72980202c349af23d093f825be left
12071207
├─╯
12081208
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
12091209
◆ 0000000000000000000000000000000000000000
@@ -1225,7 +1225,7 @@ fn test_git_colocated_update_index_merge_conflict() {
12251225

12261226
insta::assert_snapshot!(get_log_output(&work_dir), @r"
12271227
@ 4e86bd16fa83ac6276701bfa361c683e258a653b
1228-
× 985fe3b46a6caecb44b6a12d22fc2b1fc33c219d git_head()
1228+
× 985fe3b46a6caecb44b6a12d22fc2b1fc33c219d
12291229
├─╮
12301230
│ ○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
12311231
○ │ d0f55ffafa1e0e72980202c349af23d093f825be left
@@ -1281,7 +1281,7 @@ fn test_git_colocated_update_index_rebase_conflict() {
12811281
@ d0f55ffafa1e0e72980202c349af23d093f825be left
12821282
│ ○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
12831283
├─╯
1284-
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base git_head()
1284+
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
12851285
◆ 0000000000000000000000000000000000000000
12861286
[EOF]
12871287
");
@@ -1308,7 +1308,7 @@ fn test_git_colocated_update_index_rebase_conflict() {
13081308

13091309
insta::assert_snapshot!(get_log_output(&work_dir), @r"
13101310
@ b641af6d56002585b3152e84d4bd92f8181d7909 left
1311-
○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right git_head()
1311+
○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
13121312
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
13131313
◆ 0000000000000000000000000000000000000000
13141314
[EOF]
@@ -1327,7 +1327,7 @@ fn test_git_colocated_update_index_rebase_conflict() {
13271327

13281328
insta::assert_snapshot!(get_log_output(&work_dir), @r"
13291329
@ 3118c1f8fb0a6279d411eb484906e7274ab5c8f7
1330-
× b641af6d56002585b3152e84d4bd92f8181d7909 left git_head()
1330+
× b641af6d56002585b3152e84d4bd92f8181d7909 left
13311331
○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
13321332
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
13331333
◆ 0000000000000000000000000000000000000000
@@ -1408,7 +1408,7 @@ fn test_git_colocated_update_index_3_sided_conflict() {
14081408
│ │ ○ 5008c8807feaa955d02e96cb1b0dcf51536fefb8 side-3
14091409
│ ○ │ da6e0a03f8b72f6868a9ea33836123fe965c0cb4 side-2
14101410
│ ├─╯
1411-
○ │ ad7eaf61b769dce99884d2ceb0ddf48fc4eac463 side-1 git_head()
1411+
○ │ ad7eaf61b769dce99884d2ceb0ddf48fc4eac463 side-1
14121412
├─╯
14131413
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
14141414
◆ 0000000000000000000000000000000000000000
@@ -1430,7 +1430,7 @@ fn test_git_colocated_update_index_3_sided_conflict() {
14301430

14311431
insta::assert_snapshot!(get_log_output(&work_dir), @r"
14321432
@ b16ae318909e9bf70fc312217988f2ca0abccb62
1433-
× 3b8792248f224ce8e3f6652681e518a4f3cb3a0f git_head()
1433+
× 3b8792248f224ce8e3f6652681e518a4f3cb3a0f
14341434
├─┬─╮
14351435
│ │ ○ 5008c8807feaa955d02e96cb1b0dcf51536fefb8 side-3
14361436
│ ○ │ da6e0a03f8b72f6868a9ea33836123fe965c0cb4 side-2
@@ -1474,7 +1474,6 @@ fn get_log_output_divergence(work_dir: &TestWorkDir) -> CommandOutput {
14741474
commit_id.short(),
14751475
description.first_line(),
14761476
bookmarks,
1477-
if(git_head, "git_head()"),
14781477
if(divergent, "!divergence!"),
14791478
)
14801479
"#;
@@ -1487,7 +1486,6 @@ fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
14871486
separate(" ",
14881487
commit_id,
14891488
bookmarks,
1490-
if(git_head, "git_head()"),
14911489
description,
14921490
)
14931491
"#;
@@ -1592,7 +1590,7 @@ fn test_git_colocated_unreachable_commits() {
15921590
.success();
15931591
insta::assert_snapshot!(get_log_output(&work_dir), @r"
15941592
@ f3677b3e3b95a34e7017655ab612e1d11b59c713
1595-
○ cd740e230992f334de13a0bd0b35709b3f7a89af master git_head() initial
1593+
○ cd740e230992f334de13a0bd0b35709b3f7a89af master initial
15961594
◆ 0000000000000000000000000000000000000000
15971595
[EOF]
15981596
");
@@ -1644,7 +1642,7 @@ fn test_git_colocated_operation_cleanup() {
16441642

16451643
insta::assert_snapshot!(get_log_output(&work_dir), @r"
16461644
@ 40638ce20b8b74e94460e95709cb077f4307ad7c
1647-
○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature git_head() 3
1645+
○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature 3
16481646
│ ○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main 2
16491647
├─╯
16501648
○ 87f64775047d7ce62b7ee81412b8e4cc07aea40a 1
@@ -1671,7 +1669,7 @@ fn test_git_colocated_operation_cleanup() {
16711669
insta::assert_snapshot!(String::from_utf8(output.stdout).unwrap(), @"UU file");
16721670
insta::assert_snapshot!(get_log_output(&work_dir), @r"
16731671
@ 588c505e689d116180684778b29c540fe7180268
1674-
○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main git_head() 2
1672+
○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main 2
16751673
│ ○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature 3
16761674
├─╯
16771675
○ 87f64775047d7ce62b7ee81412b8e4cc07aea40a 1
@@ -1695,7 +1693,7 @@ fn test_git_colocated_operation_cleanup() {
16951693
@ aa14563cf5d892238f1e60260c5c284627d76e7c
16961694
│ ○ 588c505e689d116180684778b29c540fe7180268
16971695
├─╯
1698-
○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main git_head() 2
1696+
○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main 2
16991697
│ ○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature 3
17001698
├─╯
17011699
○ 87f64775047d7ce62b7ee81412b8e4cc07aea40a 1

0 commit comments

Comments
 (0)