From: Johannes Sixt <j6t@kdbg.org>
To: git@vger.kernel.org
Cc: Joshua Jensen <jjensen@workspacewhiz.com>, Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH 6/6] Support case folding in git fast-import when core.ignorecase=true
Date: Mon, 16 Aug 2010 21:38:14 +0200 [thread overview]
Message-ID: <8cc8aeccf7fb9af6a67487a55cfacb19c9910ecd.1281985411.git.j6t@kdbg.org> (raw)
In-Reply-To: <cover.1281985411.git.j6t@kdbg.org>
From: Joshua Jensen <jjensen@workspacewhiz.com>
When core.ignorecase=true, imported file paths will be folded to match
existing directory case.
Signed-off-by: Joshua Jensen <jjensen@workspacewhiz.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
fast-import.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 1e5d66e..82df00e 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -156,6 +156,7 @@ Format of STDIN stream:
#include "csum-file.h"
#include "quote.h"
#include "exec_cmd.h"
+#include "dir.h"
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -1461,7 +1462,7 @@ static int tree_content_set(
for (i = 0; i < t->entry_count; i++) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
+ if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
if (!slash1) {
if (!S_ISDIR(mode)
&& e->versions[1].mode == mode
@@ -1527,7 +1528,7 @@ static int tree_content_remove(
for (i = 0; i < t->entry_count; i++) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
+ if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
if (!slash1 || !S_ISDIR(e->versions[1].mode))
goto del_entry;
if (!e->tree)
@@ -1577,7 +1578,7 @@ static int tree_content_get(
for (i = 0; i < t->entry_count; i++) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
+ if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
if (!slash1) {
memcpy(leaf, e, sizeof(*leaf));
if (e->tree && is_null_sha1(e->versions[1].sha1))
--
1.7.1.402.gf1eeb
next prev parent reply other threads:[~2010-08-16 19:39 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-16 19:38 [PATCH 0/6] Extensions of core.ignorecase=true support Johannes Sixt
2010-08-16 19:38 ` [PATCH 1/6] Add string comparison functions that respect the ignore_case variable Johannes Sixt
2010-08-18 12:52 ` Ævar Arnfjörð Bjarmason
2010-08-18 12:53 ` Ævar Arnfjörð Bjarmason
2010-08-18 15:52 ` Joshua Jensen
2010-08-18 16:07 ` Ævar Arnfjörð Bjarmason
2010-08-18 18:32 ` Johannes Sixt
2010-08-18 18:58 ` Ævar Arnfjörð Bjarmason
2010-08-29 19:39 ` Ævar Arnfjörð Bjarmason
2010-08-30 14:42 ` Joshua Jensen
2010-08-30 14:51 ` Ævar Arnfjörð Bjarmason
2010-08-30 15:05 ` Jonathan Nieder
2010-08-30 14:52 ` Jonathan Nieder
2010-08-30 18:40 ` Johannes Sixt
2010-08-30 19:57 ` Ævar Arnfjörð Bjarmason
2010-08-30 20:13 ` Johannes Sixt
2010-08-16 19:38 ` [PATCH 2/6] Case insensitivity support for .gitignore via core.ignorecase Johannes Sixt
2010-08-16 19:38 ` [PATCH 3/6] Add case insensitivity support for directories when using git status Johannes Sixt
2010-08-16 19:38 ` [PATCH 4/6] Add case insensitivity support when using git ls-files Johannes Sixt
2010-08-16 19:38 ` [PATCH 5/6] Support case folding for git add when core.ignorecase=true Johannes Sixt
2010-08-16 19:38 ` Johannes Sixt [this message]
2010-08-17 19:36 ` [PATCH 0/6] Extensions of core.ignorecase=true support Robert Buck
2010-08-17 21:20 ` Johannes Sixt
2010-08-18 2:41 ` Robert Buck
2010-08-18 18:31 ` Johannes Sixt
2010-08-22 7:23 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8cc8aeccf7fb9af6a67487a55cfacb19c9910ecd.1281985411.git.j6t@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=jjensen@workspacewhiz.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).