diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-04-27 21:15:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-10 13:10:23 -0700 |
| commit | aa723a2659d416c5f7f5de8da32bcd24c3ee7626 (patch) | |
| tree | 766a21993dd8643bcf0a339732455b07b9e7fc9d | |
| parent | 8f2514e95fe142954d1dd4408cc7cb413a275844 (diff) | |
| download | git-mt/patch-id-stable.tar.gz | |
patch-id: change default to stablemt/patch-id-stable
Change the default to "--stable" that so that users don't have to
remember to enable it. Update documentation and test to match.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-patch-id.txt | 4 | ||||
| -rw-r--r-- | builtin/patch-id.c | 4 | ||||
| -rwxr-xr-x | t/t4204-patch-id.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index 31efc587ee..5ea4daa2cd 100644 --- a/Documentation/git-patch-id.txt +++ b/Documentation/git-patch-id.txt @@ -43,7 +43,7 @@ OPTIONS of "-O<orderfile>", thereby making existing databases storing such "unstable" or historical patch-ids unusable. - This is the default if patchid.stable is set to true. + This is the default. --unstable:: Use an "unstable" hash as the patch ID. With this option, @@ -52,7 +52,7 @@ OPTIONS patch-ids produced by git 1.9 and older (who do not deal with reordered patches) may want to use this option. - This is the default. + This is the default if patchid.stable is set to false. <patch>:: The diff to create the ID of. diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 77db8739b5..e11a6a77dc 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -185,9 +185,9 @@ int cmd_patch_id(int argc, const char **argv, const char *prefix) git_config(git_patch_id_config, &stable); - /* If nothing is set, default to unstable. */ + /* If nothing is set, default to stable. */ if (stable < 0) - stable = 0; + stable = 1; if (argc == 2 && !strcmp(argv[1], "--stable")) stable = 1; diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index fe011f83ff..19468d8b60 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204-patch-id.sh @@ -112,8 +112,8 @@ test_expect_success 'file order is relevant with --unstable' ' ' #Now test various option combinations. -test_expect_success 'default is unstable' ' - test_patch_id relevant default +test_expect_success 'default is stable' ' + test_patch_id irrelevant default ' test_expect_success 'patchid.stable = true is stable' ' |