File tree Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -502,14 +502,13 @@ mod rename_tracking {
502
502
suspect,
503
503
} = Fixture :: for_worktree_path ( worktree_path. to_path_buf ( ) ) . unwrap ( ) ;
504
504
505
- let source_file_name: gix_object:: bstr:: BString = "after-rename.txt" . into ( ) ;
506
-
505
+ let source_file_name = "after-rename.txt" ;
507
506
let lines_blamed = gix_blame:: file (
508
507
& odb,
509
508
suspect,
510
509
None ,
511
510
& mut resource_cache,
512
- source_file_name. as_ref ( ) ,
511
+ source_file_name. into ( ) ,
513
512
gix_blame:: Options {
514
513
diff_algorithm : gix_diff:: blob:: Algorithm :: Histogram ,
515
514
range : BlameRanges :: default ( ) ,
@@ -523,7 +522,7 @@ mod rename_tracking {
523
522
assert_eq ! ( lines_blamed. len( ) , 3 ) ;
524
523
525
524
let git_dir = worktree_path. join ( ".git" ) ;
526
- let baseline = Baseline :: collect ( git_dir. join ( "after-rename.baseline" ) , source_file_name) . unwrap ( ) ;
525
+ let baseline = Baseline :: collect ( git_dir. join ( "after-rename.baseline" ) , source_file_name. into ( ) ) . unwrap ( ) ;
527
526
528
527
pretty_assertions:: assert_eq!( lines_blamed, baseline) ;
529
528
}
Original file line number Diff line number Diff line change @@ -8,22 +8,22 @@ git config merge.ff false
8
8
9
9
git checkout -q -b main
10
10
11
- echo -e " line 1\nline 2\nline 3\nline 4 " > before-rename.txt
11
+ seq 1 4 > before-rename.txt
12
12
git add before-rename.txt
13
13
git commit -q -m c1
14
14
15
15
mv before-rename.txt after-rename.txt
16
16
git add before-rename.txt after-rename.txt
17
17
git commit -q -m c2
18
18
19
- echo -e " line 1\nline 2\nline 3\nline 4\nline 5 " > after-rename.txt
19
+ seq 1 5 > after-rename.txt
20
20
git add after-rename.txt
21
21
git commit -q -m c3
22
22
23
23
git checkout -b different-branch
24
24
git reset --hard HEAD~2
25
25
26
- echo -e " line 0\nline 1\nline 2\nline 3\nline 4 " > before-rename.txt
26
+ seq 0 4 > before-rename.txt
27
27
git add before-rename.txt
28
28
git commit -q -m c10
29
29
You can’t perform that action at this time.
0 commit comments