git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: git@vger.kernel.org
Cc: sunshine@sunshineco.com, jrnieder@gmail.com, peff@peff.net,
	gitster@pobox.com
Subject: [PATCH v6 4/5] patch-id: change default to stable
Date: Sun, 27 Apr 2014 21:15:54 +0300	[thread overview]
Message-ID: <1398622524-26207-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1398622524-26207-1-git-send-email-mst@redhat.com>

--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>
---
 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

  parent reply	other threads:[~2014-04-27 18:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-27 18:15 [PATCH v6 1/5] patch-id: make it stable against hunk reordering Michael S. Tsirkin
2014-04-27 18:15 ` [PATCH v6 2/5] test: add test_write_lines helper Michael S. Tsirkin
2014-05-05 23:51   ` [PATCH] test doc: test_write_lines does not split its arguments Jonathan Nieder
2014-05-06 18:20     ` Michael S. Tsirkin
2014-04-27 18:15 ` [PATCH v6 3/5] patch-id-test: test stable and unstable behaviour Michael S. Tsirkin
2014-04-27 18:15 ` Michael S. Tsirkin [this message]
2014-04-27 18:15 ` [PATCH v6 5/5] t4204-patch-id.sh: default is now stable Michael S. Tsirkin
2014-04-29 21:45 ` [PATCH v6 1/5] patch-id: make it stable against hunk reordering Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398622524-26207-4-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).