Skip to content

Commit 06ef8ef

Browse files
ByronByron
committed
Don't use committer for change-id.
1 parent bfa4c5a commit 06ef8ef

File tree

4 files changed

+78
-78
lines changed

4 files changed

+78
-78
lines changed

‎crates/but-rebase/tests/rebase/main.rs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ fn single_stack_journey() -> Result<()> {
4040
// The base remains unchanged, and two commits remain: a squash commit and a merge with
4141
// the original `c` commit.
4242
insta::assert_snapshot!(visualize_commit_graph(&repo, out.top_commit)?, @r"
43-
* 2d43db8 third step: merge C into b
43+
* 59ff155 third step: merge C into b
4444
|\
4545
| * 120e3a9 (HEAD -> main) c
4646
| * a96434e b
4747
| * d591dfe a
48-
* | cff6d50 second step: squash b into a
48+
* | db12e70 second step: squash b into a
4949
|/
5050
* 35b8235 base
5151
");
5252

5353
// The reference points to the commit and correctly refers to the one that was fixed up.
5454
insta::assert_debug_snapshot!(out, @r#"
5555
RebaseOutput {
56-
top_commit: Sha1(2d43db878f75eb143dc6de5a4ba7e6854fc3c289),
56+
top_commit: Sha1(59ff1558ab5f78c5889bd5bf386b06a402b5a7eb),
5757
references: [
5858
ReferenceSpec {
5959
reference: Virtual(
6060
"anchor",
6161
),
62-
commit_id: Sha1(cff6d50539eb1e7decb8e3ab533435af6a8390bd),
62+
commit_id: Sha1(db12e70c7c70a8907834694fa3b2ac7155072608),
6363
previous_commit_id: Sha1(a96434e2505c2ea0896cf4f58fec0778e074d3da),
6464
},
6565
],
@@ -69,28 +69,28 @@ fn single_stack_journey() -> Result<()> {
6969
Sha1(35b8235197020a417e9405ab5d4db6f204e8d84b),
7070
),
7171
Sha1(d591dfed1777b8f00f5b7b6f427537eeb5878178),
72-
Sha1(cb580b312dbacb76e7ca7298e0f3f478437f8e41),
72+
Sha1(f60c5fc0acd40bd60d3b1d7a0680acaeb7a38623),
7373
),
7474
(
7575
Some(
7676
Sha1(35b8235197020a417e9405ab5d4db6f204e8d84b),
7777
),
7878
Sha1(a96434e2505c2ea0896cf4f58fec0778e074d3da),
79-
Sha1(cff6d50539eb1e7decb8e3ab533435af6a8390bd),
79+
Sha1(db12e70c7c70a8907834694fa3b2ac7155072608),
8080
),
8181
(
8282
Some(
8383
Sha1(35b8235197020a417e9405ab5d4db6f204e8d84b),
8484
),
8585
Sha1(a96434e2505c2ea0896cf4f58fec0778e074d3da),
86-
Sha1(cff6d50539eb1e7decb8e3ab533435af6a8390bd),
86+
Sha1(db12e70c7c70a8907834694fa3b2ac7155072608),
8787
),
8888
(
8989
Some(
9090
Sha1(35b8235197020a417e9405ab5d4db6f204e8d84b),
9191
),
9292
Sha1(120e3a90b753a492cef9a552ae3b9ba1f1391362),
93-
Sha1(2d43db878f75eb143dc6de5a4ba7e6854fc3c289),
93+
Sha1(59ff1558ab5f78c5889bd5bf386b06a402b5a7eb),
9494
),
9595
],
9696
}
@@ -140,9 +140,9 @@ fn amended_commit() -> Result<()> {
140140
.rebase()?;
141141
// Note how the `C` isn't visible anymore as we don't rewrite reference here.
142142
insta::assert_snapshot!(visualize_commit_graph(&repo, out.top_commit)?, @r"
143-
*-. bf2b2c8 Merge branches 'A', 'B' and 'C' - rewritten
143+
*-. c2c5558 Merge branches 'A', 'B' and 'C' - rewritten
144144
|\ \
145-
| | * a349d28 C: add another 10 lines to new file - amended
145+
| | * 2d75f8b C: add another 10 lines to new file - amended
146146
| | * 68a2fc3 C: add 10 lines to new file
147147
| | * 984fd1c C: new file with 10 lines
148148
| * | a748762 (B) B: another 10 lines at the bottom
@@ -155,22 +155,22 @@ fn amended_commit() -> Result<()> {
155155
// This time without anchor.
156156
insta::assert_debug_snapshot!(out, @r"
157157
RebaseOutput {
158-
top_commit: Sha1(bf2b2c8e643b194cb2b52b19735fc5c968677c7a),
158+
top_commit: Sha1(c2c555849ef51f5946643b8705a527a4ee790d40),
159159
references: [],
160160
commit_mapping: [
161161
(
162162
Some(
163163
Sha1(68a2fc349e13a186e6d65871a31bad244d25e6f4),
164164
),
165165
Sha1(930563a048351f05b14cc7b9c0a48640e5a306b0),
166-
Sha1(a349d28d8f54b7fff64752260c33903ca1daf52d),
166+
Sha1(2d75f8bfde82379541e8a0fe78c05d5abd87e4bc),
167167
),
168168
(
169169
Some(
170170
Sha1(68a2fc349e13a186e6d65871a31bad244d25e6f4),
171171
),
172172
Sha1(134887021e06909021776c023a608f8ef179e859),
173-
Sha1(bf2b2c8e643b194cb2b52b19735fc5c968677c7a),
173+
Sha1(c2c555849ef51f5946643b8705a527a4ee790d40),
174174
),
175175
],
176176
}
@@ -222,46 +222,46 @@ fn reorder_with_conflict_and_remerge() -> Result<()> {
222222
.rebase()?;
223223
insta::assert_debug_snapshot!(out, @r"
224224
RebaseOutput {
225-
top_commit: Sha1(68691619d227cba38210e9f208d35f665c1da26f),
225+
top_commit: Sha1(f22b757b001bcdc8f8a7dd6d5b07760c0d7b0cd8),
226226
references: [],
227227
commit_mapping: [
228228
(
229229
Some(
230230
Sha1(8f0d33828e5c859c95fb9e9fc063374fdd482536),
231231
),
232232
Sha1(984fd1c6d3975901147b1f02aae6ef0a16e5904e),
233-
Sha1(54eda7593379f1922c84b40cb26eb6fdd86cdf0e),
233+
Sha1(010a2c6ea3c64bd0076965fc334f278bac6a5aa3),
234234
),
235235
(
236236
Some(
237237
Sha1(8f0d33828e5c859c95fb9e9fc063374fdd482536),
238238
),
239239
Sha1(930563a048351f05b14cc7b9c0a48640e5a306b0),
240-
Sha1(6844bf4c9640e04aaded1eca6389c67896fb07e6),
240+
Sha1(ea7cc6f97abe553c1f6c533630a5da987d282bae),
241241
),
242242
(
243243
Some(
244244
Sha1(8f0d33828e5c859c95fb9e9fc063374fdd482536),
245245
),
246246
Sha1(68a2fc349e13a186e6d65871a31bad244d25e6f4),
247-
Sha1(4e3b7bf536b065291e64a4f20ef7292d4318f4dd),
247+
Sha1(284e6112ce457925b4c163e55b75430f3548c9c4),
248248
),
249249
(
250250
Some(
251251
Sha1(8f0d33828e5c859c95fb9e9fc063374fdd482536),
252252
),
253253
Sha1(134887021e06909021776c023a608f8ef179e859),
254-
Sha1(68691619d227cba38210e9f208d35f665c1da26f),
254+
Sha1(f22b757b001bcdc8f8a7dd6d5b07760c0d7b0cd8),
255255
),
256256
],
257257
}
258258
");
259259
insta::assert_snapshot!(visualize_commit_graph(&repo, out.top_commit)?, @r"
260-
*-. 6869161 Re-merge branches 'A', 'B' and 'C'
260+
*-. f22b757 Re-merge branches 'A', 'B' and 'C'
261261
|\ \
262-
| | * 4e3b7bf C~1
263-
| | * 6844bf4 C
264-
| | * 54eda75 C~2
262+
| | * 284e611 C~1
263+
| | * ea7cc6f C
264+
| | * 010a2c6 C~2
265265
| * | a748762 (B) B: another 10 lines at the bottom
266266
| * | 62e05ba B: 10 lines at the bottom
267267
| |/
@@ -301,10 +301,10 @@ fn pick_the_first_commit_with_no_parents_for_squashing() -> Result<()> {
301301
},
302302
])?
303303
.rebase()?;
304-
insta::assert_snapshot!(visualize_commit_graph(&repo, out.top_commit)?, @"* a67ed12 reworded base after squash");
304+
insta::assert_snapshot!(visualize_commit_graph(&repo, out.top_commit)?, @"* f1c9b38 reworded base after squash");
305305
insta::assert_debug_snapshot!(out, @r"
306306
RebaseOutput {
307-
top_commit: Sha1(a67ed124df50035c1cfa05f66777bdcbaae92b72),
307+
top_commit: Sha1(f1c9b383cd5e1c95b2d948e537dc723c6c9c52b3),
308308
references: [],
309309
commit_mapping: [
310310
(
@@ -315,7 +315,7 @@ fn pick_the_first_commit_with_no_parents_for_squashing() -> Result<()> {
315315
(
316316
None,
317317
Sha1(d591dfed1777b8f00f5b7b6f427537eeb5878178),
318-
Sha1(a67ed124df50035c1cfa05f66777bdcbaae92b72),
318+
Sha1(f1c9b383cd5e1c95b2d948e537dc723c6c9c52b3),
319319
),
320320
],
321321
}
@@ -421,7 +421,7 @@ pub mod utils {
421421
.set("GIT_COMMITTER_DATE", "2000-01-02 00:00:00 +0000")
422422
.set("GIT_COMMITTER_EMAIL", "[email protected]")
423423
.set("GIT_COMMITTER_NAME", "committer")
424-
.set("CHANGE_ID", "committer");
424+
.set("CHANGE_ID", "change-id");
425425
// assure it doesn't get racy.
426426
std::mem::forget(env);
427427
}

‎crates/but-workspace/tests/workspace/commit_engine/new_commit.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn from_unborn_head() -> anyhow::Result<()> {
2626
CreateCommitOutcome {
2727
rejected_specs: [],
2828
new_commit: Some(
29-
Sha1(2eb2e90e37a7f23052db17b67b91eb5c4a7a1e81),
29+
Sha1(5e2d025d182645489ec761af73f565f41ab5eccc),
3030
),
3131
changed_tree_pre_cherry_pick: Some(
3232
Sha1(861d6e23ee6a2d7276618bb78700354a3506bd71),
@@ -69,7 +69,7 @@ fn from_unborn_head() -> anyhow::Result<()> {
6969
CreateCommitOutcome {
7070
rejected_specs: [],
7171
new_commit: Some(
72-
Sha1(9fa45065e99a2f0492bca947cf462dfafd905516),
72+
Sha1(83f954427c5d4e0dadfdaa32069300d02c4190ee),
7373
),
7474
changed_tree_pre_cherry_pick: Some(
7575
Sha1(a0044697412bfa8432298d6bd6a2ad0dbd655c9f),
@@ -379,7 +379,7 @@ fn commit_to_one_below_tip_with_three_context_lines() -> anyhow::Result<()> {
379379

380380
assert_eq!(
381381
outcome.new_commit.map(|id| id.to_string()),
382-
Some("a33e9992196d88b09118158608acf4234b3273a9".to_string())
382+
Some("e973f53830337edae78ba3cb1c45272ecb5f9f61".to_string())
383383
);
384384
let tree = visualize_tree(&repo, &outcome)?;
385385
assert_eq!(
@@ -576,7 +576,7 @@ fn unborn_untracked_worktree_filters_are_applied_to_whole_files() -> anyhow::Res
576576
CreateCommitOutcome {
577577
rejected_specs: [],
578578
new_commit: Some(
579-
Sha1(f45994afa0d26558ae4bea626917b70f8863a29b),
579+
Sha1(d58e3930fa21fdcd35f7447baa2f097c15ce38e8),
580580
),
581581
changed_tree_pre_cherry_pick: Some(
582582
Sha1(d5949f12727c8e89e1351b89e8e510dfa1e2adc9),
@@ -614,7 +614,7 @@ fn unborn_untracked_worktree_filters_are_applied_to_whole_files() -> anyhow::Res
614614
CreateCommitOutcome {
615615
rejected_specs: [],
616616
new_commit: Some(
617-
Sha1(9218f64284f5b8f31c42aed238ec89ff1836a253),
617+
Sha1(f2f38d7d25b69f7a122342538bc807a1796c5111),
618618
),
619619
changed_tree_pre_cherry_pick: Some(
620620
Sha1(cef74127e0e9f4c46b5ff360d6208ee0cc839eba),

0 commit comments

Comments
 (0)