cargo-git 0.7.0

An opinionated helper command to use git with cargo. This does not replace the git command but should be used in conjunction with.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

use crate::git::Git;
use crate::Squash;

pub fn run(params: Squash) -> Result<(), Box<dyn std::error::Error>> {
    let mut git = Git::open()?;

    let revision = if let Some(rev) = params.revision {
        rev
    } else if let (_forked_at, Some(parent)) = git.get_parent()? {
        parent
    } else {
        return Err("Could not find forked point and no revision provided!".into());
    };

    let (_ahead, behind) = git.graph_ahead_behind("HEAD", revision.as_str())?;

    if behind > 0 {
        return Err(format!("The current branch is not up-to-date with '{}'!", revision).into());
    }

    let hash = git.reset_soft(revision.as_str(), "moving for squashing")?;

    println!("HEAD moved to {}", hash);

    Ok(())
}