On Sun, Jan 10, 2016 at 7:30 PM, Stephen P. Smith <ischis2@xxxxxxx> wrote:
> We can pass -o/--output-directory to the format-patch command to store
> patches in some place other than the working directory. This patch
> introduces format.outputDirectory configuration option for same
> purpose.
>
> The case of usage of this configuration option can be convinience
> to not pass every time -o/--output-directory if an user has pattern
> to store all patches in the /patches directory for example.
>
> The format.outputDirectory has lower priority than command line
> option, so if user will set format.outputDirectory and pass the
> command line option, a result will be stored in a directory that
> passed to command line option.
>
> Signed-off-by: Alexander Kuleshov <kuleshovmail@xxxxxxxxx>
> Signed-off-by: Stephen P. Smith <ischis2@xxxxxxx>
> ---
> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
> @@ -1445,4 +1445,20 @@ test_expect_success 'From line has expected format' '
> +test_expect_success 'format-patch format.outputDirectory option' '
> + test_config format.outputDirectory patches &&
> + rm -fr patches &&
> + git format-patch master..side &&
> + ls patches >actual &&
> + test_line_count = 3 actual
> +'
Now that you've moved the new tests to the bottom of the script, this
test fails. This is because, at this point, there are 18 commits in
the range 'master..side', not 3 as when the test was at the top of the
script. You could change the 3 to an 18, however, that would be
fragile: if someone inserts or modifies tests above this one, then a
hard-coded 18 might become stale. One possible fix would be:
test $(git rev-list master..side | wc -l) -eq $(ls patches)
You could also take the stance that you're not so much interested in
the number of patches in the range 'master..side' but rather you
merely care about the fact that the "patches" directory got created
and some patches were deposited there. In that case, you might do this
instead:
git format-patch -3 side &&
ls patches >actual &&
test_line_count = 3 actual
I don't feel strongly about it either way, but whichever approach you
choose, please do build the project and run this test script to ensure
that it succeeds before submitting v5. Thanks.
> +test_expect_success 'format-patch -o overrides format.outputDirectory' '
> + test_config format.outputDirectory patches &&
> + rm -fr patches patchset &&
> + git format-patch master..side -o patchset &&
> + test_path_is_missing patches &&
> + test_path_is_dir patchset
> +'
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html