diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2014-04-24 12:07:18 +0300 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2014-05-18 23:39:34 +0300 |
commit | 51e4fd05d76d181de81d391602298a81fb33a0c2 (patch) | |
tree | 2b5a994cccaf37494a9436c73d3dffe14f2b619c | |
parent | 29591fe57b7b2af398657e3f4f25b47221b8b886 (diff) | |
download | git-51e4fd05d76d181de81d391602298a81fb33a0c2.tar.gz |
patch-id: change default to stable
--stable has been the default in 'next' for a few weeks with no ill
effects.
Change the default to that so that users don't have to remember to
enable it.
Update documentation to match behaviour change.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | Documentation/git-patch-id.txt | 4 | ||||
-rw-r--r-- | builtin/patch-id.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index fa562d32bf..1e2ca75032 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; |