Skip to content

Commit 8e2bc0f

Browse files
committed
refactor
- an easier way of generate changing lines.
1 parent 2541378 commit 8e2bc0f

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

gix-blame/tests/blame.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -502,14 +502,13 @@ mod rename_tracking {
502502
suspect,
503503
} = Fixture::for_worktree_path(worktree_path.to_path_buf()).unwrap();
504504

505-
let source_file_name: gix_object::bstr::BString = "after-rename.txt".into();
506-
505+
let source_file_name = "after-rename.txt";
507506
let lines_blamed = gix_blame::file(
508507
&odb,
509508
suspect,
510509
None,
511510
&mut resource_cache,
512-
source_file_name.as_ref(),
511+
source_file_name.into(),
513512
gix_blame::Options {
514513
diff_algorithm: gix_diff::blob::Algorithm::Histogram,
515514
range: BlameRanges::default(),
@@ -523,7 +522,7 @@ mod rename_tracking {
523522
assert_eq!(lines_blamed.len(), 3);
524523

525524
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();
527526

528527
pretty_assertions::assert_eq!(lines_blamed, baseline);
529528
}
Binary file not shown.

gix-blame/tests/fixtures/make_blame_rename_tracking_repo.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ git config merge.ff false
88

99
git checkout -q -b main
1010

11-
echo -e "line 1\nline 2\nline 3\nline 4" > before-rename.txt
11+
seq 1 4 > before-rename.txt
1212
git add before-rename.txt
1313
git commit -q -m c1
1414

1515
mv before-rename.txt after-rename.txt
1616
git add before-rename.txt after-rename.txt
1717
git commit -q -m c2
1818

19-
echo -e "line 1\nline 2\nline 3\nline 4\nline 5" > after-rename.txt
19+
seq 1 5 > after-rename.txt
2020
git add after-rename.txt
2121
git commit -q -m c3
2222

2323
git checkout -b different-branch
2424
git reset --hard HEAD~2
2525

26-
echo -e "line 0\nline 1\nline 2\nline 3\nline 4" > before-rename.txt
26+
seq 0 4 > before-rename.txt
2727
git add before-rename.txt
2828
git commit -q -m c10
2929

0 commit comments

Comments
 (0)