From d05e85571573513439b4e2aa287aaa0d3797ad5c Mon Sep 17 00:00:00 2001
From: Bryan Kendall <bkend@google.com>
Date: Mon, 29 Nov 2021 10:47:42 -0800
Subject: [PATCH] fixes --project flag on init command (#3902)

---
 CHANGELOG.md                 | 1 +
 src/init/features/project.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb2d..1e25e6708ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+- Fixes issue where providing the `--project` flag during `init` would not be recognized with a default project already set. (#3870)
diff --git a/src/init/features/project.ts b/src/init/features/project.ts
index 7587575462c..e52d848c83d 100644
--- a/src/init/features/project.ts
+++ b/src/init/features/project.ts
@@ -115,7 +115,7 @@ export async function doSetup(setup: any, config: any, options: any): Promise<vo
   logger.info();
 
   const projectFromRcFile = _.get(setup.rcfile, "projects.default");
-  if (projectFromRcFile) {
+  if (projectFromRcFile && !options.project) {
     utils.logBullet(`.firebaserc already has a default project, using ${projectFromRcFile}.`);
     // we still need to get project info in case user wants to init firestore or storage, which
     // require a resource location:
@@ -128,6 +128,7 @@ export async function doSetup(setup: any, config: any, options: any): Promise<vo
   let projectMetaData;
   // If the user presented a project with `--project`, try to fetch that project.
   if (options.project) {
+    logger.debug(`Using project from CLI flag: ${options.project}`);
     projectMetaData = await getFirebaseProject(options.project);
   } else {
     projectMetaData = await projectChoicePrompt(options);