Version 0.003000

Changes

@@ -1,3 +1,24 @@
+# 0.003000
+
+The most important change to the interface is that now, if there are any hunks
+staged in the index, only those hunks will be considered for assigning to fixup
+commits. A temporary git index is used to make any created fixup commits, so
+any staged hunks that don't get assigned will remain staged. Thanks to Jonas
+Bernoulli and Max Odnoletkov for their help with this.
+
+- Add --gitopt to allow working around git settings issues
+- Add --exit-code option, which gives more granular status about what subset of
+  hunks were assigned to commits
+
+Bug fixes:
+
+- Fix diff commands so that the diff.noprefix, diff.mnemonicPrefix, and
+  diff.external settings don't result in us getting unexpected input. Thanks to
+  Paolo Giarrusso and Ryan Campbell for help with this.
+- Fix bug where multiple hunks assigned to the same commit would result in
+  copies of the same fixup commit, resulting in "patch does not apply" errors.
+  Thanks to Johannes Altmanninger for identifying and fixing this.
+
 # 0.002007
 
 - Fix hunk parsing for files with multiple hunks (broken in 0.002006)

README.pod

@@ -63,6 +63,40 @@ Change the number of context lines C<git diff> uses around hunks. Default: 3. Th
 
 Set how strict F<git-autofixup> is about assigning hunks to fixup commits. Default: 0. Strictness levels are described under DESCRIPTION.
 
+=item -g ARG, --gitopt ARG
+
+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<-c diff.algorithm>, this option must be used multiple times: C<-g -c -g diff.algorithm=patience>.
+
+=item -e, --exit-code
+
+Use more detailed exit codes:
+
+=over
+
+=item 0
+
+All hunks have been assigned.
+
+=item 1
+
+Only some hunks have been assigned.
+
+=item 2
+
+No hunks have been assigned.
+
+=item 3
+
+There was nothing to be assigned.
+
+=item 255
+
+Unexpected error occurred.
+
+=back
+
 =back
 
 =head1 INSTALLATION

git-autofixup

@@ -10,7 +10,7 @@ use Getopt::Long qw(:config bundling);
 use File::Temp;
 use File::Spec ();
 
-our $VERSION = 0.002007; # X.YYYZZZ
+our $VERSION = 0.003000; # X.YYYZZZ
 
 my $VERBOSE;
 my @GIT_OPTIONS;

lib/App/Git/Autofixup.pm

@@ -2,7 +2,7 @@ package App::Git::Autofixup;
 use strict;
 use warnings FATAL => 'all';
 
-our $VERSION = 0.002007;
+our $VERSION = 0.003000;
 
 =head1 NAME
 

t/autofixup.t

@@ -13,7 +13,7 @@ if ($OSNAME eq 'MSWin32') {
 } elsif (!has_git()) {
     plan skip_all => 'git version 1.7.4+ required'
 } else {
-    plan tests => 39;
+    plan tests => 40;
 }
 
 require './git-autofixup';