Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion builtin/repo.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ static void stats_table_print_structure(const struct stats_table *table)
const char *unit = "";

if (entry) {
struct stats_table_entry *entry = item->util;
value = entry->value;
if (entry->unit)
unit = entry->unit;
Expand Down
6 changes: 3 additions & 3 deletions t/t7605-merge-resolve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ merge_c1_to_c2_cmds='
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_file c2.c &&
test 3 = $(git ls-tree -r HEAD | wc -l) &&
test 3 = $(git ls-files | wc -l)
'
Expand Down
Loading