Support annotated tags when using --squash

Change: annotated-tags-squash

Author: christian-schilling

src/bin/josh-filter.rs

@@ -176,10 +176,9 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
         let pattern = pattern.to_string();
         for reference in repo.references_glob(&pattern).unwrap() {
             let reference = reference?;
-            if let Some(target) = reference.target() {
-                ids.push((target, reference.name().unwrap().to_string()));
-                refs.push((reference.name().unwrap().to_string(), target));
-            }
+            let target = reference.peel_to_commit()?.id();
+            ids.push((target, reference.name().unwrap().to_string()));
+            refs.push((reference.name().unwrap().to_string(), target));
         }
         filterobj = josh::filter::chain(josh::filter::squash(Some(&ids)), filterobj);
     };

tests/filter/squash.t

@@ -39,7 +39,9 @@
   Use '--' to separate paths from revisions, like this:
   'git <command> [<revision>...] -- [<file>...]'
   [128]
-  $ git tag tag_a 1d69b7d
+
+This one tag is an annotated tag, to make sure those are handled as well
+  $ git tag -a tag_a -m "created a tag" 1d69b7d
   $ josh-filter -s --squash "refs/tags/*" :author=\"New\ Author\"\;\"new@e.mail\" --update refs/heads/filtered
   [1] :author="New Author";"new@e.mail"
   [1] :squash(