Hunk sections should use the full path, not basename() (Addresses #280)

so-fancy · Jan 18, 2018 · 49969f0 · 49969f0
1 parent 068c0ec
commit 49969f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/diff-so-fancy b/diff-so-fancy
@@ -241,7 +241,7 @@ sub do_dsf_stuff {
  }
 
  my ($orig_offset, $orig_count, $new_offset, $new_count) = parse_hunk_header($hunk_header);
- $last_file_seen = basename($last_file_seen);
+ #$last_file_seen = basename($last_file_seen);
 
  # Figure out the start line
  my $start_line = start_line_calc($new_offset,$new_count);

diff --git a/test/diff-so-fancy.bats b/test/diff-so-fancy.bats
@@ -177,15 +177,15 @@ output=$( load_fixture "ls-function" | $diff_so_fancy )
  output=$( load_fixture "dotfiles" | $diff_so_fancy )
  run printf "%s" "$output"
 
- assert_line --index 188 --partial "@ diff-so-fancy:1 @"
+ assert_line --index 188 --partial "@ bin/diff-so-fancy:1 @"
 }
 
 @test "Hunk formatting: @@@ -A,B -C,D +E,F @@@" {
  # stderr forced into output
  output=$( load_fixture "complex-hunks" | $diff_so_fancy 2>&1 )
  run printf "%s" "$output"
 
- assert_line --index 4 --partial "@ header_clean.pl:107 @"
+ assert_line --index 4 --partial "@ libs/header_clean/header_clean.pl:107 @"
  refute_output --partial 'Use of uninitialized value'
 }
 
@@ -221,5 +221,5 @@ output=$( load_fixture "ls-function" | $diff_so_fancy )
  run printf "%s" "$output"
 
  assert_line --index 1 --partial "modified: doc/manual.xml.head"
- assert_line --index 3 --partial "@ manual.xml.head:8355 @"
+ assert_line --index 3 --partial "@ doc/manual.xml.head:8355 @"
 }