From: "Alex Riesen" <raa.lkml@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <junkio@cox.net>
Subject: [PATCH] merge-recursive implicitely depends on trust_executable_bit
Date: Mon, 6 Nov 2006 11:38:52 +0100 [thread overview]
Message-ID: <81b0412b0611060238k29c20ff6le555aa0579ecc0ae@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 134 bytes --]
Read the configuration in to get core.filemode value for this
particular repository.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
[-- Attachment #2: 0001-merge-recursive-implicitely-depends-on-trust_executable_bit-core.filemode.txt --]
[-- Type: text/plain, Size: 806 bytes --]
From 193ac65259b5de19fae1a1bd5d4adb55988086f6 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 6 Nov 2006 09:24:17 +0100
Subject: [PATCH] merge-recursive implicitely depends on trust_executable_bit (core.filemode).
Read the configuration in to get its value for this particular repository
---
merge-recursive.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 2ba43ae..c81048d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1308,6 +1308,7 @@ int main(int argc, char *argv[])
const char *branch1, *branch2;
struct commit *result, *h1, *h2;
+ git_config(git_default_config); /* core.filemode */
original_index_file = getenv("GIT_INDEX_FILE");
if (!original_index_file)
--
1.4.3.3.gb2828
reply other threads:[~2006-11-06 10:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=81b0412b0611060238k29c20ff6le555aa0579ecc0ae@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).