App::Git::Autofixup - create fixup commits for topic branches
git-autofixup [<options>] <revision>
git-autofixup parses hunks of changes in the working directory out of git diff output and uses git blame to assign those hunks to commits in <revision>..HEAD, which will typically represent a topic branch, and then creates fixup commits to be used with git rebase --interactive --autosquash. It is assumed that hunks near changes that were previously committed to the topic branch are related.
git diff
git blame
<revision>..HEAD
git rebase --interactive --autosquash
@{upstream} or @{u} is likely a convenient value to use for <revision> if the current branch has a tracking branch. See git help revisions for other ways to specify revisions.
@{upstream}
@{u}
<revision>
git help revisions
If any changes have been staged to the index using git add, then git-autofixup will only consider staged hunks when trying to create fixup commits. A temporary index is used to create any resulting commits.
git add
By default a hunk will be included in a fixup commit if all the lines in the hunk's context blamed on topic branch commits refer to the same commit, so there's no ambiguity about which commit the hunk corresponds to. If there is ambiguity the assignment behaviour used under --strict 1 will be used to attempt to resolve it. If --strict 1 is given the same topic branch commit must be blamed for every removed line and at least one of the lines adjacent to each added line, and added lines must not be adjacent to lines blamed on other topic branch commits. All the same restrictions apply when --strict 2 is given, but each added line must be surrounded by lines blamed on the same topic branch commit.
--strict 1
--strict 2
For example, the added line in the hunk below is adjacent to lines committed by commits 99f370af and a1eadbe2. If these are both topic branch commits then it's ambiguous which commit the added line is fixing up and the hunk will be ignored.
99f370af
a1eadbe2
COMMIT |LINE|HEAD |WORKING DIRECTORY 99f370af| 1|first line | first line | | |+added line a1eadbe2| 2|second line | second line
But if that second line were instead blamed on an upstream commit (denoted by ^), the hunk would be added to a fixup commit for 99f370af:
^
99f370af| 1|first line | first line | | |+added line ^ | 2|second line | second line
Output similar to this example can be generated by setting verbosity to 2 or greater by using the verbosity option multiple times, eg. git-autofixup -vv, and can be helpful in determining how a hunk will be handled.
git-autofixup -vv
git-autofixup is not to be used mindlessly. Always inspect the created fixup commits to ensure hunks have been assigned correctly, especially when used on a working directory that has been changed with a mix of fixups and new work.
Show usage.
Show manpage.
Show version.
Increase verbosity. Can be used up to two times.
Change the number of context lines git diff uses around hunks. Default: 3. This can change how hunks are assigned to fixup commits, especially with --strict 0.
--strict 0
Set how strict git-autofixup is about assigning hunks to fixup commits. Default: 0. Strictness levels are described under DESCRIPTION.
Specify option for git. Can be used multiple times. Useful for testing, to override config options that break git-autofixup, or to override global diff options to tweak what git-autofixup considers a hunk.
Note ARG won't be wordsplit, so to give multiple arguments, such as for setting a config option like -c diff.algorithm, this option must be used multiple times: -g -c -g diff.algorithm=patience.
-c diff.algorithm
-g -c -g diff.algorithm=patience
Use more detailed exit codes:
All hunks have been assigned.
Only some hunks have been assigned.
No hunks have been assigned.
There was nothing to be assigned.
Unexpected error occurred.
If cpan is available, run cpan -i App::Git::Autofixup. Otherwise, copy git-autofixup to a directory in PATH and ensure it has execute permissions. It can then be invoked as either git autofixup or git-autofixup, since git searches PATH for appropriately named binaries.
cpan -i App::Git::Autofixup
PATH
git autofixup
git-autofixup
Git is distributed with Perl 5 for platforms not expected to already have it installed, but installing modules with cpan requires other tools that might not be available, such as make. This script has no dependencies outside of the standard library, so it is hoped that it works on any platform that Git does without much trouble.
Requires a git supporting commit --fixup: 1.7.4 or later.
commit --fixup
If a topic branch adds some lines in one commit and subsequently removes some of them in another, a hunk in the working directory that re-adds those lines will be assigned to fixup the first commit, and during rebasing they'll be removed again by the later commit.
Not tested in cmd.exe on Windows. Run it from Git Bash, Cygwin, or a similar Unix emulation environment.
git-autofixup was inspired by a description of hg absorb in the Mercurial Sprint Notes. While I was working on it I found git-superfixup, by oktal3700, which was helpful to examine.
Copyright (C) 2017, Jordan Torbiak.
This program is free software; you can redistribute it and/or modify it under the terms of the Artistic License v2.0.
To install App::Git::Autofixup, copy and paste the appropriate command in to your terminal.
cpanm
cpanm App::Git::Autofixup
CPAN shell
perl -MCPAN -e shell install App::Git::Autofixup
For more information on module installation, please visit the detailed CPAN module installation guide.