From 740ac29b7738d89feab8e5ff0af9d8a073e33894 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Mon, 15 Aug 2016 16:44:14 -0700 Subject: [PATCH] base: Don't treat "Base unchanged" as an error Notify the user but return successfully, so that it won't cause a rebase to fail. --- src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index f705f20ab46fcc2eb8b09dba568d659818e150bb..b0f14c719eae6ad42ebf9be5717da50518eae9dd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -473,7 +473,8 @@ fn base(repo: &Repository, m: &ArgMatches) -> Result<()> { }; if current_base_id == new_base_id { - return Err("Base unchanged".into()); + println!("Base unchanged"); + return Ok(()); } if !current_base_id.is_zero() {