From 7d3e456a41a535b599270653eb7ca6edc630fa74 Mon Sep 17 00:00:00 2001
From: Pagwin <pgp2024@pagwin.xyz>
Date: Sun, 8 Sep 2024 14:17:33 -0400
Subject: [PATCH] Fixed bug with certain commit hashes and code improvements

The bug was that if a byte in a commit id was less than 16 then it would
have a leading 0 which the format specifier that printed hex would
ignore.

The code improvements were removing instances or reading newlines from
stdin because breakpoints are better and the print statements are
sufficeient as points to break on, it may make sense to replace them
with function calls to functions which noop in future but for now this
is good enough.

In addition ignored some warnings in enum definitions, having error info
is useful in the debugger if nothing else so we're not just going to
throw that away due to a warning.
---
 Cargo.lock  |  2 +-
 Cargo.toml  |  2 +-
 src/main.rs | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d30d1c2..6756c7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -290,7 +290,7 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "ppi"
-version = "1.1.2"
+version = "1.1.4"
 dependencies = [
  "clap",
  "dirs",
diff --git a/Cargo.toml b/Cargo.toml
index 4c9812a..edd4a4b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ppi"
-version = "1.1.3"
+version = "1.1.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src/main.rs b/src/main.rs
index 6c70e7b..a8470fe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,7 +21,7 @@ struct Config{
     subcommands: Subcommands
 }
 
-
+#[allow(dead_code)]
 #[derive(Debug)]
 enum Errors{IoErr(std::io::Error), GitErr(git2::Error), CliErr(CliError), Unknown}
 impl From<std::io::Error> for Errors {
@@ -103,7 +103,6 @@ fn main() -> Result<(),Errors> {
                     #[cfg(debug_assertions)]
                     {
                         eprintln!("repo cloned");
-                        std::io::stdin().read_line(&mut String::new())?;
                     }
 
                     eprintln!("checking out appropriate branch");
@@ -116,7 +115,6 @@ fn main() -> Result<(),Errors> {
                     #[cfg(debug_assertions)]
                     {
                         eprintln!("origin deleted");
-                        std::io::stdin().read_line(&mut String::new())?;
                     }
 
                     let mut walk = repo.revwalk()?;
@@ -128,16 +126,18 @@ fn main() -> Result<(),Errors> {
                     #[cfg(debug_assertions)]
                     {
                         eprintln!("oldest commit found");
-                        std::io::stdin().read_line(&mut String::new())?;
                     }
                     let pwd = repo.path().parent().expect("very bad cloning into the root dir happening");
                     eprintln!("rebasing skeleton's commits down into single commit {:?}", pwd);
                     // I give up git2 documentation/api is just too bad for me to do this with it
                     
-
+                    let commit_arg:&str = &oldest_commit.id()
+                        .as_bytes().iter()
+                        .map(|byte|format!("{:02x}",byte))
+                        .collect::<String>()[0..7];
                     handle_process(std::process::Command::new("git")
                         .current_dir(pwd)
-                        .args(["reset", "--mixed" , oldest_commit.id().as_bytes().iter().map(|byte|format!("{:x}",byte)).collect::<String>().chars().take(7).collect::<String>().as_str()]))?;
+                        .args(["reset", "--mixed" , commit_arg]))?;
 
                     handle_process(std::process::Command::new("git")
                         .current_dir(pwd)
@@ -163,6 +163,7 @@ fn main() -> Result<(),Errors> {
     prog_copy.print_help()?;
     Ok(())
 }
+#[allow(dead_code)]
 #[derive(Debug)]
 enum CliError{Io(std::io::Error), NonZero}
 impl From<std::io::Error> for CliError {