fix: prefer --authdate over patch time with author

fixes #457 Signed-off-by: kyle merfeld <kmerfeld1@gmail.com>
stacked-git · Jun 16, 2024 · 5b0defa · 5b0defa
1 parent 10d816e
commit 5b0defa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/patch/edit/mod.rs b/src/patch/edit/mod.rs
@@ -594,10 +594,10 @@ fn author_from_args(
     matches: &clap::ArgMatches,
     time: Option<gix::date::Time>,
 ) -> Result<Option<gix::actor::Signature>> {
-    let time = if let Some(time) = time {
-        time
-    } else if let Some(authdate) = matches.get_one::<gix::date::Time>("authdate").copied() {
+    let time = if let Some(authdate) = matches.get_one::<gix::date::Time>("authdate").copied() {
         authdate
+    } else if let Some(time) = time {
+        time
     } else {
         return Ok(None);
     };

diff --git a/t/t3300-edit.sh b/t/t3300-edit.sh
@@ -331,6 +331,12 @@ test_expect_success 'Fail to set invalid author date' '
     test "$(adate HEAD)" = "2013-01-28 22:30:00 -0300"
 '
 
+test_expect_success 'Set author date and author' '
+    stg edit p2 --authdate "2000-01-28 22:30:00 -0300" --author "Elizabeth Bennet <ebennet@example.com>" &&
+    test "$(adate HEAD)" = "2000-01-28 22:30:00 -0300" &&
+    test "$(auth HEAD)" = "Elizabeth Bennet, ebennet@example.com"
+'
+
 test_expect_success 'Set author date to "now"' '
     before=$(date "+%F %T %z") &&
     stg edit p2 --authdate now &&