From 6ea0b840922d44687d6624319d41fb3d48925f30 Mon Sep 17 00:00:00 2001 From: Waleed Khan Date: Tue, 25 Jun 2024 19:34:12 -0400 Subject: [PATCH] feat(submit:phabricator): pass `--allow-untracked` to `arc` This is normal when moving back and forth between commits that change a `.gitignore`: there might be files which are untracked in one commit but ignored in another. --- git-branchless-submit/src/phabricator.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/git-branchless-submit/src/phabricator.rs b/git-branchless-submit/src/phabricator.rs index ceea56f37..b21fb3c89 100644 --- a/git-branchless-submit/src/phabricator.rs +++ b/git-branchless-submit/src/phabricator.rs @@ -365,7 +365,7 @@ impl Forge for PhabricatorForge<'_> { .map_err(|err| Error::VerifyPermissions { source: err })? .map_err(Error::BuildRebasePlan)?; let command = if !should_mock() { - let mut args = vec!["arc", "diff", "--create", "--verbatim"]; + let mut args = vec!["arc", "diff", "--create", "--verbatim", "--allow-untracked"]; if *draft { args.push("--draft"); } @@ -614,7 +614,14 @@ Differential Revision: https://phabricator.example.com/D000$(git rev-list --coun .map_err(Error::BuildRebasePlan)?; let test_options = ResolvedTestOptions { command: if !should_mock() { - let mut args = vec!["arc", "diff", "--head", "HEAD", "HEAD^"]; + let mut args = vec![ + "arc", + "diff", + "--head", + "HEAD", + "HEAD^", + "--allow-untracked", + ]; args.extend(match message { Some(message) => ["-m", message.as_ref()], None => ["-m", "update"],