From 8f57d6070619f82c990f85b266db62a2e38b1b68 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Fri, 17 Mar 2023 09:33:24 +0100 Subject: [PATCH] cli: Don't rely on working copy for `patch show` Since the patch may not have been pulled into the working copy, we shouldn't rely on it for displaying patch information. --- radicle-cli/src/commands/patch/show.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/radicle-cli/src/commands/patch/show.rs b/radicle-cli/src/commands/patch/show.rs index 635f6623..d700c50e 100644 --- a/radicle-cli/src/commands/patch/show.rs +++ b/radicle-cli/src/commands/patch/show.rs @@ -12,14 +12,15 @@ use crate::terminal as term; fn show_patch_diff( patch: &patch::Patch, storage: &Repository, - workdir: &git::raw::Repository, + // TODO: Tell user which working copy branches point to the patch. + _workdir: &git::raw::Repository, ) -> anyhow::Result<()> { let target_head = patch_merge_target_oid(patch.target(), storage)?; - let base_oid = workdir.merge_base(target_head, **patch.head())?; + let base_oid = storage.raw().merge_base(target_head, **patch.head())?; let diff = format!("{}..{}", base_oid, patch.head()); process::Command::new("git") - .current_dir(workdir.path()) + .current_dir(storage.path()) .args(["log", "--patch", &diff]) .stdout(process::Stdio::inherit()) .stderr(process::Stdio::inherit())