File tree 2 files changed +14
-2
lines changed 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -180,7 +180,11 @@ impl Index {
180
180
. or_else ( |_| Oid :: from_str ( EMPTY_TREE_HASH ) ) ?;
181
181
let to = {
182
182
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
+ )
184
188
} ) ?;
185
189
let latest_fetched_commit_oid =
186
190
self . repo . refname_to_id ( "refs/remotes/origin/master" ) ?;
Original file line number Diff line number Diff line change @@ -67,7 +67,15 @@ fn quick_changes_since_last_fetch() {
67
67
)
68
68
. expect ( "reset success" ) ;
69
69
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
+ ) ;
71
79
assert ! ( num_seen_after_reset < num_changes_since_first_commit) ;
72
80
assert ! ( num_seen_after_reset > 1000 ) ;
73
81
You can’t perform that action at this time.
0 commit comments