From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Brian Gernhardt <benji@silverinsanity.com>
Cc: Git Mailing List <git@vger.kernel.org>, gitster@pobox.com
Subject: [PATCH] check_repository_format_version(): run git_default_config() again
Date: Mon, 6 Aug 2007 18:32:16 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0708061831070.14781@racer.site> (raw)
In-Reply-To: <2BA49414-54E0-4353-B237-7799B675FAE8@silverinsanity.com>
I broke this in "e90fdc39: Clean up work-tree handling". It is
needed, for example for interpreting core.pager before starting the
pager.
Noticed by Brian Gernhardt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
My first commit with git-gui! Yeah!
On Mon, 6 Aug 2007, Brian Gernhardt wrote:
> I don't have time to look into it, but something broke the
> core.pager variable. I've bisected it down to
> "e90fdc39b6903502192b2dd11e5503cea721a1ad: Clean up work-tree
> handling".
Thanks.
setup.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/setup.c b/setup.c
index 4945eb3..35fa031 100644
--- a/setup.c
+++ b/setup.c
@@ -355,7 +355,8 @@ int check_repository_format_version(const char *var, const char *value)
free(git_work_tree_cfg);
git_work_tree_cfg = xstrdup(value);
inside_work_tree = -1;
- }
+ } else
+ return git_default_config(var, value);
return 0;
}
--
1.5.3.rc4.17.gb980
next prev parent reply other threads:[~2007-08-06 17:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-06 15:56 core.pager handling broken Brian Gernhardt
2007-08-06 17:32 ` Johannes Schindelin [this message]
[not found] ` <7vbqdkcxy3.fsf@assigned-by-dhcp.cox.net>
2007-08-06 20:26 ` [PATCH] check_repository_format_version(): run git_default_config() again Junio C Hamano
2007-08-06 23:08 ` Junio C Hamano
2007-08-06 23:26 ` Johannes Schindelin
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=Pine.LNX.4.64.0708061831070.14781@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).