@@ -6,7 +6,7 @@ fn apply_mailbox() -> Result {
6
6
let repo = named_repo ( "make_am_repo.sh" ) ?;
7
7
8
8
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
9
- assert_eq ! ( repo. in_progress_operation ( ) , Some ( git:: state:: InProgress :: ApplyMailbox ) ) ;
9
+ assert_eq ! ( repo. state ( ) , Some ( git:: state:: InProgress :: ApplyMailbox ) ) ;
10
10
Ok ( ( ) )
11
11
}
12
12
@@ -15,7 +15,7 @@ fn bisect() -> Result {
15
15
let repo = named_repo ( "make_bisect_repo.sh" ) ?;
16
16
17
17
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
18
- assert_eq ! ( repo. in_progress_operation ( ) , Some ( git:: state:: InProgress :: Bisect ) ) ;
18
+ assert_eq ! ( repo. state ( ) , Some ( git:: state:: InProgress :: Bisect ) ) ;
19
19
20
20
Ok ( ( ) )
21
21
}
@@ -25,7 +25,7 @@ fn cherry_pick() -> Result {
25
25
let repo = named_repo ( "make_cherry_pick_repo.sh" ) ?;
26
26
27
27
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
28
- assert_eq ! ( repo. in_progress_operation ( ) , Some ( git:: state:: InProgress :: CherryPick ) ) ;
28
+ assert_eq ! ( repo. state ( ) , Some ( git:: state:: InProgress :: CherryPick ) ) ;
29
29
Ok ( ( ) )
30
30
}
31
31
@@ -34,10 +34,7 @@ fn cherry_pick_sequence() -> Result {
34
34
let repo = named_repo ( "make_cherry_pick_sequence_repo.sh" ) ?;
35
35
36
36
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
37
- assert_eq ! (
38
- repo. in_progress_operation( ) ,
39
- Some ( git:: state:: InProgress :: CherryPickSequence )
40
- ) ;
37
+ assert_eq ! ( repo. state( ) , Some ( git:: state:: InProgress :: CherryPickSequence ) ) ;
41
38
42
39
Ok ( ( ) )
43
40
}
@@ -47,7 +44,7 @@ fn merge() -> Result {
47
44
let repo = named_repo ( "make_merge_repo.sh" ) ?;
48
45
49
46
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
50
- assert_eq ! ( repo. in_progress_operation ( ) , Some ( git:: state:: InProgress :: Merge ) ) ;
47
+ assert_eq ! ( repo. state ( ) , Some ( git:: state:: InProgress :: Merge ) ) ;
51
48
52
49
Ok ( ( ) )
53
50
}
@@ -57,10 +54,7 @@ fn rebase_interactive() -> Result {
57
54
let repo = named_repo ( "make_rebase_i_repo.sh" ) ?;
58
55
59
56
assert ! ( repo. head( ) ?. is_detached( ) ) ;
60
- assert_eq ! (
61
- repo. in_progress_operation( ) ,
62
- Some ( git:: state:: InProgress :: RebaseInteractive )
63
- ) ;
57
+ assert_eq ! ( repo. state( ) , Some ( git:: state:: InProgress :: RebaseInteractive ) ) ;
64
58
65
59
Ok ( ( ) )
66
60
}
@@ -70,7 +64,7 @@ fn revert() -> Result {
70
64
let repo = named_repo ( "make_revert_repo.sh" ) ?;
71
65
72
66
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
73
- assert_eq ! ( repo. in_progress_operation ( ) , Some ( git:: state:: InProgress :: Revert ) ) ;
67
+ assert_eq ! ( repo. state ( ) , Some ( git:: state:: InProgress :: Revert ) ) ;
74
68
75
69
Ok ( ( ) )
76
70
}
@@ -80,10 +74,7 @@ fn revert_sequence() -> Result {
80
74
let repo = named_repo ( "make_revert_sequence_repo.sh" ) ?;
81
75
82
76
assert_eq ! ( repo. head_name( ) ?. unwrap( ) . shorten( ) , "main" ) ;
83
- assert_eq ! (
84
- repo. in_progress_operation( ) ,
85
- Some ( git:: state:: InProgress :: RevertSequence )
86
- ) ;
77
+ assert_eq ! ( repo. state( ) , Some ( git:: state:: InProgress :: RevertSequence ) ) ;
87
78
88
79
Ok ( ( ) )
89
80
}
0 commit comments