Skip to content

Commit b111e03

Browse files
jyn514Byron
authored andcommitted
Add some more debugging info to failing test
1 parent 79cf4ca commit b111e03

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/index.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,11 @@ impl Index {
180180
.or_else(|_| Oid::from_str(EMPTY_TREE_HASH))?;
181181
let to = {
182182
self.repo.find_remote("origin").and_then(|mut r| {
183-
r.fetch(&["refs/heads/master:refs/remotes/origin/master"], options, None)
183+
r.fetch(
184+
&["refs/heads/master:refs/remotes/origin/master"],
185+
options,
186+
None,
187+
)
184188
})?;
185189
let latest_fetched_commit_oid =
186190
self.repo.refname_to_id("refs/remotes/origin/master")?;

tests/index.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,15 @@ fn quick_changes_since_last_fetch() {
6767
)
6868
.expect("reset success");
6969
let num_seen_after_reset = index.fetch_changes().unwrap().len();
70-
assert!(seen_marker_ref == origin_master_of(&index));
70+
let origin_master = origin_master_of(&index);
71+
assert!(
72+
seen_marker_ref == origin_master,
73+
"{} ({}) != {} ({})",
74+
seen_marker_ref.name().unwrap(),
75+
seen_marker_ref.peel_to_commit().unwrap().id(),
76+
origin_master.name().unwrap(),
77+
origin_master.peel_to_commit().unwrap().id()
78+
);
7179
assert!(num_seen_after_reset < num_changes_since_first_commit);
7280
assert!(num_seen_after_reset > 1000);
7381

0 commit comments

Comments
 (0)