From a47840cd9aef5490c66bda1709375b2492629b66 Mon Sep 17 00:00:00 2001
From: Jun Wu <quark@fb.com>
Date: Fri, 6 Jul 2018 10:32:44 -0700
Subject: [PATCH] gitignore: turn on by default

Summary: It seems to work well. Let's turn it on by default.

Reviewed By: singhsrb

Differential Revision: D8744808

fbshipit-source-id: 61a8b8750f53d91ae94d019a88f27697309cfd66
---
 mercurial/configitems.py | 2 +-
 tests/test-hgignore.t    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
index 3792b0f3c8..bce9fce802 100644
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -454,7 +454,7 @@ coreconfigitem("ui", "forcemerge", default=None)
 coreconfigitem("ui", "formatdebug", default=False)
 coreconfigitem("ui", "formatjson", default=False)
 coreconfigitem("ui", "formatted", default=None)
-coreconfigitem("ui", "gitignore", default=False)
+coreconfigitem("ui", "gitignore", default=True)
 coreconfigitem("ui", "graphnodetemplate", default=None)
 coreconfigitem("ui", "hgignore", default=True)
 coreconfigitem("ui", "http2debuglevel", default=None)
diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
index c30492a682..48018387e3 100644
--- a/tests/test-hgignore.t
+++ b/tests/test-hgignore.t
@@ -203,10 +203,10 @@ Test relative ignore path (issue4473):
   $ hg debugignore --config ui.gitignore=1
   <unionmatcher matchers=[<gitignorematcher>, <includematcher includes='(?:(?:|.*/)[^/]*(?:/|$))'>]>
 
-  $ hg debugignore
+  $ hg debugignore --config ui.gitignore=0
   <includematcher includes='(?:(?:|.*/)[^/]*(?:/|$))'>
 
-  $ hg debugignore --config ui.hgignore=0
+  $ hg debugignore --config ui.hgignore=0 --config ui.gitignore=0
   <includematcher includes=''>
 
   $ hg debugignore b.o