From d1553e3ab1cf8642e063c82ff3b97764e95e664d Mon Sep 17 00:00:00 2001
From: Alan Smithee <nextsasasa@gmail.com>
Date: Sun, 27 Feb 2022 21:02:43 +0900
Subject: [PATCH 1/2] changed crate load together

---
 src/main.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 533b6e73..640cfcf7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,11 +9,9 @@ use chrono::{DateTime, Local};
 use evtx::{EvtxParser, ParserSettings};
 use git2::Repository;
 use hayabusa::detections::detection::{self, EvtxRecordInfo};
-use hayabusa::detections::print::AlertMessage;
-use hayabusa::detections::print::ERROR_LOG_PATH;
-use hayabusa::detections::print::ERROR_LOG_STACK;
-use hayabusa::detections::print::QUIET_ERRORS_FLAG;
-use hayabusa::detections::print::STATISTICS_FLAG;
+use hayabusa::detections::print::{
+    AlertMessage, ERROR_LOG_PATH, ERROR_LOG_STACK, QUIET_ERRORS_FLAG, STATISTICS_FLAG,
+};
 use hayabusa::detections::rule::{get_detection_keys, RuleNode};
 use hayabusa::filter;
 use hayabusa::omikuji::Omikuji;

From b22798fddd432d772f389296c8918ac6d8cfd015 Mon Sep 17 00:00:00 2001
From: Alan Smithee <nextsasasa@gmail.com>
Date: Sun, 27 Feb 2022 21:04:33 +0900
Subject: [PATCH 2/2] added merge process when submodule update option #422

---
 src/main.rs | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index 640cfcf7..efd95b2b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -524,6 +524,46 @@ impl App {
         let submodules = hayabusa_repo.submodules()?;
         for mut submodule in submodules {
             submodule.update(true, None)?;
+            let submodule_repo = submodule.open()?;
+            let mut exit_flag = false;
+            // origin/mainのfetchができなくなるケースはネットワークなどのケースが考えられるため、git cloneは実施しない
+            submodule_repo
+                .find_remote("origin")?
+                .fetch(&["main"], None, None)
+                .map_err(|e| {
+                    AlertMessage::alert(
+                        &mut BufWriter::new(std::io::stderr().lock()),
+                        &format!("Failed git fetch to rules folder. {}", e),
+                    )
+                    .ok();
+                    exit_flag = true;
+                })
+                .ok();
+            if exit_flag {
+                return Err(git2::Error::from_str(&String::default()));
+            }
+            let fetch_head = submodule_repo.find_reference("FETCH_HEAD")?;
+            let fetch_commit = submodule_repo.reference_to_annotated_commit(&fetch_head)?;
+            let analysis = submodule_repo.merge_analysis(&[&fetch_commit])?;
+            if analysis.0.is_up_to_date() {
+                continue;
+            } else if analysis.0.is_fast_forward() {
+                let refname = "refs/heads/main";
+                let mut reference = submodule_repo.find_reference(&refname)?;
+                reference.set_target(fetch_commit.id(), "Fast-Forward")?;
+                submodule_repo.set_head(&refname)?;
+                submodule_repo
+                    .checkout_head(Some(git2::build::CheckoutBuilder::default().force()))
+                    .ok();
+            } else if analysis.0.is_normal() {
+                AlertMessage::alert(
+                &mut BufWriter::new(std::io::stderr().lock()),
+                &"update-rules option is git Fast-Forward merge only. please check your rules folder."
+                    .to_string(),
+            )
+            .ok();
+                return Err(git2::Error::from_str(&String::default()));
+            }
         }
         return Ok(());
     }