Rename to git-instafix (#15)

git-fixup is taken by a bunch of other projects

Author: quodlibetor

.github/workflows/release.yml

@@ -243,7 +243,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          repository: "quodlibetor/homebrew-git-fixup"
+          repository: "quodlibetor/homebrew-git-tools"
           token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
       # So we have access to the formula
       - name: Fetch local artifacts

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.2.0
+
+* Rename to git-instafix because there are a bunch of existing projects named git-fixup
+
 # Version 0.1.9
 
 * CI and doc improvements

Cargo.lock

@@ -1,11 +1,11 @@
 [package]
-name = "git-fixup"
-version = "0.1.9"
+name = "git-instafix"
+version = "0.2.0"
 authors = ["Brandon W Maister <[email protected]>"]
 edition = "2021"
-default-run = "git-fixup"
+default-run = "git-instafix"
 publish = false
-repository = "https://github.com/quodlibetor/git-fixup"
+repository = "https://github.com/quodlibetor/git-instafix"
 description = """Apply staged git changes to an ancestor git commit.
 """
 
@@ -42,15 +42,15 @@ cargo-dist-version = "0.10.0"
 # CI backends to support
 ci = ["github"]
 # The installers to generate for each app
-installers = ["shell", "npm", "homebrew", "msi"]
+installers = ["shell", "homebrew", "msi"]
 # A GitHub repo to push Homebrew formulas to
-tap = "quodlibetor/homebrew-git-fixup"
+tap = "quodlibetor/homebrew-git-tools"
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
+targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
 # The archive format to use for windows builds (defaults .zip)
 windows-archive = ".tar.gz"
 # The archive format to use for non-windows builds (defaults .tar.xz)
-unix-archive = ".tar.gz"
+unix-archive = ".tar.xz"
 # Publish jobs to run in CI
 publish-jobs = ["homebrew"]
 publish-prerelease = true

Cargo.toml

@@ -1,22 +1,22 @@
-# git fixup
+# git instafix
 
 Quickly fix up an old commit using your currently-staged changes.
 
 ![usage](./static/full-workflow-simple.gif)
 
 ## Usage
 
-After installation, just run `git fixup` or `git squash` to perform the related
-actions.
+After installation, just run `git instafix` to commit your currently-staged
+changes to an older commit in your branch.
 
-By default, `git fixup` checks for staged changes and offers to amend an old
+By default, `git instafix` checks for staged changes and offers to amend an old
 commit.
 
 Given a repo that looks like:
 
 ![linear-repo](./static/00-initial-state.png)
 
-Running `git fixup` will allow you to edit an old commit:
+Running `git instafix` will allow you to edit an old commit:
 
 ![linear-repo-fixup](./static/01-selector.gif)
 
@@ -28,44 +28,41 @@ If you're using a pull-request workflow (e.g. github) you will often have repos
 
 ![full-repo](./static/20-initial-full-repo.png)
 
-You can set `GIT_INSTAFIX_UPSTREAM` to a branch name and `git fixup` will only
+You can set `GIT_INSTAFIX_UPSTREAM` to a branch name and `git instafix` will only
 show changes between HEAD and the merge-base:
 
 ![full-repo-fixup](./static/21-with-upstream.gif)
 
 In general this is just what you want, since you probably shouldn't be editing
 commits that other people are working off of.
 
-After you select the commit to edit, `git fixup` will apply your staged changes
+After you select the commit to edit, `git instafix` will apply your staged changes
 to that commit without any further prompting or work from you.
 
-`git-squash` is just a symlink to `git-fixup` installed by brew, but if you
-invoke it (either as `git-squash` or `git squash`) it will behave the same,
-asking you which change to amend, but after you have selected the commit to git
-will give you a chance to edit the commit message before changing the tree at
-that point.
+Adding the `--squash` flag will behave the same, but after you have selected the commit amend to
+git will give you a chance to edit the commit message before changing the tree at that point.
 
 ## Installation
 
 If you're on macos or linux and using homebrew you should be able to do:
 
-    brew install quodlibetor/git-fixup/git-fixup
-    
+    brew install quodlibetor/git-tools/git-instafix
+
 You can also install from this repo with `cargo`:
 
-    cargo install --git https://github.com/quodlibetor/git-fixup
+    cargo install --git https://github.com/quodlibetor/git-instafix
 
 Otherwise, you will need to compile with Rust. Install rust, clone this repo,
 build, and then copy the binary into your bin dir:
 
     curl https://sh.rustup.rs -sSf | sh
-    git clone https://github.com/quodlibetor/git-fixup && cd git-fixup
+    git clone https://github.com/quodlibetor/git-instafix && cd git-instafix
     cargo build --release
-    cp target/release/git-fixup /usr/local/bin/git-fixup
+    cp target/release/git-instafix /usr/local/bin/git-instafix
 
 ## License
 
-git-fixup is licensed under either of
+git-instafix is licensed under either of
 
  * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
    http://www.apache.org/licenses/LICENSE-2.0)

README.md

@@ -150,7 +150,7 @@ fn do_rebase_inner(
                         if rebase.operation_current() != Some(rebase.len() - 1) {
                             branch
                                 .get_mut()
-                                .set_target(new_id, "git-fixup retarget historical branch")?;
+                                .set_target(new_id, "git-instafix retarget historical branch")?;
                         }
                     }
                 }

src/lib.rs

@@ -63,7 +63,7 @@ fn main() {
     if env::args().next().unwrap().ends_with("squash") {
         args.squash = true
     }
-    if let Err(e) = git_fixup::instafix(
+    if let Err(e) = git_instafix::instafix(
         args.squash,
         args.max_commits,
         args.commit_message_pattern,

src/main.rs

@@ -287,14 +287,7 @@ fn git_inner(args: &[&str], tempdir: &assert_fs::TempDir) -> Command {
 
 /// Get something that can get args added to it
 fn fixup(dir: &assert_fs::TempDir) -> Command {
-    let mut c = Command::cargo_bin("git-fixup").unwrap();
+    let mut c = Command::cargo_bin("git-instafix").unwrap();
     c.current_dir(&dir.path());
     c
 }
-
-fn rebase(onto: &str, dir: &assert_fs::TempDir) -> Command {
-    let mut c = Command::cargo_bin("git-rebase-with-intermediates").unwrap();
-    c.current_dir(&dir.path());
-    c.arg(onto);
-    c
-}

tests/basic.rs

@@ -60,7 +60,7 @@
 
     <Product
         Id='*'
-        Name='git-fixup'
+        Name='git-instafix'
         UpgradeCode='F5B771EA-3725-4523-9EE3-06FA112A5573'
         Manufacturer='Brandon W Maister'
         Language='1033'
@@ -84,11 +84,11 @@
             DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.'/>
 
         <Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'/>
-        <Property Id='DiskPrompt' Value='git-fixup Installation'/>
+        <Property Id='DiskPrompt' Value='git-instafix Installation'/>
 
         <Directory Id='TARGETDIR' Name='SourceDir'>
             <Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
-                <Directory Id='APPLICATIONFOLDER' Name='git-fixup'>
+                <Directory Id='APPLICATIONFOLDER' Name='git-instafix'>
 
                     <!--
                       Enabling the license sidecar file in the installer is a four step process:
@@ -124,9 +124,9 @@
                         <Component Id='binary0' Guid='*'>
                             <File
                                 Id='exe0'
-                                Name='git-fixup.exe'
+                                Name='git-instafix.exe'
                                 DiskId='1'
-                                Source='$(var.CargoTargetBinDir)\git-fixup.exe'
+                                Source='$(var.CargoTargetBinDir)\git-instafix.exe'
                                 KeyPath='yes'/>
                         </Component>
                     </Directory>
@@ -174,7 +174,7 @@
         <!--<Icon Id='ProductICO' SourceFile='wix\Product.ico'/>-->
         <!--<Property Id='ARPPRODUCTICON' Value='ProductICO' />-->
 
-        <Property Id='ARPHELPLINK' Value='https://github.com/quodlibetor/git-fixup'/>
+        <Property Id='ARPHELPLINK' Value='https://github.com/quodlibetor/git-instafix'/>
 
         <UI>
             <UIRef Id='WixUI_FeatureTree'/>