0c70e17 remote-helper: inform the user of an empty patch — heartwood

Radicle Heartwood Protocol & Stack

remote-helper: inform the user of an empty patch

✗ CI failure Fintan Halpenny committed 5 months ago

commit 0c70e171238a7b3a56d6c4f275ad79150753f43f
parent 28c8c1531ff5797c5877f94e6756cada530a8e0f

2 passed 3 failed (5 total) View logs

2 files changed +5 -1

modified crates/radicle-cli/examples/rad-patch-via-push.md

@@ -330,6 +330,7 @@ we should get an error:

 ``` (stderr) (fail)
 $ git push rad master:refs/patches
 warn: attempted to create a patch using the commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354, but this commit is already included in the base branch
 To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
  ! [remote rejected] master -> refs/patches (patch commits are already included in the base branch)
 error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'

modified crates/radicle-remote-helper/src/push.rs

@@ -31,7 +31,7 @@ use radicle::{git, rad};

 use radicle_cli as cli;
 use radicle_cli::terminal as term;
 use crate::{hint, read_line, Options, Verbosity};
 use crate::{hint, read_line, warn, Options, Verbosity};
 #[derive(Debug, Error)]
 pub enum Error {

@@ -566,6 +566,9 @@ where

     let base = patch_base(head, &opts, stored)?;
     if base == *head {
         warn(format!(
             "attempted to create a patch using the commit {head}, but this commit is already included in the base branch"
         ));
         return Err(Error::EmptyPatch);
     }