Move redirect short circuit upwards

Author: brophdawg11

packages/router/router.ts

@@ -3395,6 +3395,11 @@ function getMatchesToLoad(
       return;
     }
 
+    // Don't revalidate an actively redirecting fetcher
+    if (fetchRedirectIds.has(key)) {
+      return;
+    }
+
     let fetcherMatches = matchRoutes(routesToUse, f.path, basename);
 
     // If the fetcher path no longer matches, push it in with null matches so
@@ -3418,10 +3423,7 @@ function getMatchesToLoad(
     let fetcherMatch = getTargetMatch(fetcherMatches, f.path);
 
     let shouldRevalidate = false;
-    if (fetchRedirectIds.has(key)) {
-      // Never trigger a revalidation of an actively redirecting fetcher
-      shouldRevalidate = false;
-    } else if (cancelledFetcherLoads.includes(key)) {
+    if (cancelledFetcherLoads.includes(key)) {
       // Always revalidate if the fetcher was cancelled
       shouldRevalidate = true;
     } else if (