git-mfc: Improve handling of remotes

If we can't figure out which remote to use, print a useful error instead
of assuming that "freebsd" is the right remote to use.

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/tools/git/git-mfc b/tools/tools/git/git-mfc
index 431ed2ebc861..c6c4ea2b786a 100755
--- a/tools/tools/git/git-mfc
+++ b/tools/tools/git/git-mfc
@@ -501,11 +501,11 @@ def main():
     if args.remote:
         remote = args.remote
     else:
-        try:
-            tracking = repo.active_branch.tracking_branch()
-            remote = tracking.remote_name if tracking else 'freebsd'
-        except (TypeError, ValueError):
-            remote = 'freebsd'
+        tracking = repo.active_branch.tracking_branch()
+        if tracking:
+            remote = tracking.remote_name
+        else:
+            err(1, "could not find upstream branch, use --remote")
 
     upstream = remote + '/' + origin