--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 <m...@redhat.com>
---
builtin/patch-id.c | 4 ++--
Documentation/git-patch-id.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 77db873..e11a6a7 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/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index fa562d3..1e2ca75 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.
--
MST
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
