From cf4e05e325d0885142bdf8f833e129945e9df595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Val=C3=A9rio?= <gon@ovalerio.net>
Date: Fri, 6 Nov 2020 00:34:29 +0000
Subject: [PATCH] step twenty five: cli pass HEAD by default

---
 src/base.rs |  6 +++++-
 src/main.rs | 21 ++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/base.rs b/src/base.rs
index e9b6d3e..2e30302 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -119,7 +119,11 @@ pub fn create_tag(name: String, oid: String) {
     data::update_ref(format!("refs/tags/{}", name), oid);
 }
 
-pub fn get_oid(name: String) -> String {
+pub fn get_oid(mut name: String) -> String {
+    if name == "@".to_owned() {
+        name = "HEAD".to_owned();
+    }
+
     let refs_to_try: [String; 4] = [
         format!("{}", name),
         format!("refs/{}", name),
diff --git a/src/main.rs b/src/main.rs
index 8db13bd..40f638c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -41,7 +41,7 @@ fn main() {
         .subcommand(
             SubCommand::with_name("log")
                 .about("List all commits")
-                .arg(Arg::with_name("oid").index(1).required(false)),
+                .arg(Arg::with_name("oid").index(1).default_value("@")),
         )
         .subcommand(
             SubCommand::with_name("checkout")
@@ -52,7 +52,7 @@ fn main() {
             SubCommand::with_name("tag")
                 .about("Create a tag for a given commit")
                 .arg(Arg::with_name("name").index(1).required(true))
-                .arg(Arg::with_name("oid").index(2).required(false)),
+                .arg(Arg::with_name("oid").index(2).default_value("@")),
         )
         .get_matches();
 
@@ -114,13 +114,8 @@ fn commit(matches: ArgMatches) {
 
 fn log_commits(matches: ArgMatches) {
     if let Some(cmd_matches) = matches.subcommand_matches("log") {
-        let provided_ref = cmd_matches.value_of("oid").unwrap_or("").to_owned();
-        let mut oid;
-        if provided_ref == "" {
-            oid = base::get_oid("HEAD".to_owned());
-        } else {
-            oid = base::get_oid(provided_ref.to_owned());
-        }
+        let provided_ref = cmd_matches.value_of("oid").unwrap().to_owned();
+        let mut oid = base::get_oid(provided_ref.to_owned());
 
         loop {
             let commit = base::get_commit(oid.clone());
@@ -148,12 +143,8 @@ fn checkout(matches: ArgMatches) {
 fn tag(matches: ArgMatches) {
     if let Some(cmd_matches) = matches.subcommand_matches("tag") {
         let name = cmd_matches.value_of("name").unwrap().to_owned();
-        let mut oid = cmd_matches.value_of("oid").unwrap_or("").to_owned();
-        if oid == "" {
-            oid = base::get_oid("HEAD".to_owned());
-        } else {
-            oid = base::get_oid(name.clone());
-        }
+        let provided_ref = cmd_matches.value_of("oid").unwrap().to_owned();
+        let oid = base::get_oid(provided_ref.clone());
         base::create_tag(name, oid);
     }
 }