Restore NotFastForward test

jj-vcs · Apr 18, 2024 · 9034333 · 9034333
1 parent 6eec3b6
commit 9034333
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/lib/src/git.rs b/lib/src/git.rs
@@ -1400,24 +1400,26 @@ fn push_refs(
                 _ => GitPushError::InternalGitError(err),
             })
     };
-    if remaining_remote_refs_expected_locations.is_empty() {
-        push_result?;
-        Ok(())
-    } else if !failed_push_negotiations.is_empty() {
+    if !failed_push_negotiations.is_empty() {
         // TODO: move this into `map_err` above (if possible) once
         // https://github.com/rust-lang/git2-rs/issues/1042 is fully resolved.
         assert!(push_result.is_err());
         Err(GitPushError::RefInUnexpectedLocation(
             failed_push_negotiations,
         ))
     } else {
-        Err(GitPushError::RefUpdateRejected(
-            remaining_remote_refs_expected_locations
-                .keys()
-                .sorted()
-                .map(|name| name.to_string())
-                .collect(),
-        ))
+        push_result?;
+        if remaining_remote_refs_expected_locations.is_empty() {
+            Ok(())
+        } else {
+            Err(GitPushError::RefUpdateRejected(
+                remaining_remote_refs_expected_locations
+                    .keys()
+                    .sorted()
+                    .map(|name| name.to_string())
+                    .collect(),
+            ))
+        }
     }
 }
 

diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs
@@ -2722,11 +2722,7 @@ fn test_push_branches_not_fast_forward() {
     );
     assert_debug_snapshot!(result, @r###"
     Err(
-        RefUpdateRejected(
-            [
-                "refs/heads/main",
-            ],
-        ),
+        NotFastForward,
     )
     "###);
 }