From: "Andrej Shadura via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: Andrej Shadura <andrew.shadura@collabora.co.uk>, Andrej Shadura <andrew.shadura@collabora.co.uk> Subject: [PATCH 1/2] add: add option --no-filters to disable attribute-based filtering Date: Fri, 19 Feb 2021 18:12:12 +0000 [thread overview] Message-ID: <cf8eb886a1e29c94ee5ec070fb380d6bc36f40db.1613758333.git.gitgitgadget@gmail.com> (raw) In-Reply-To: <pull.880.git.1613758333.gitgitgadget@gmail.com> From: Andrej Shadura <andrew.shadura@collabora.co.uk> It is possible for a user to disable attribute-based filtering when committing by doing one of the following: * Create .git/info/attributes unapplying all possible transforming attributes. * Use git hash-object and git update-index to stage files manually. Doing the former requires keeping an up-to-date list of all attributes which can transform files when committing or checking out. Doing the latter is difficult, error-prone and slow when done from scripts. Instead, similarly to git hash-object, --no-filter can be added to git add to enable temporarily disabling filtering in an easy to use way: * Add new flag ADD_CACHE_RAW to add_to_index() * Add new flag HASH_RAW to index_fd() Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> --- Documentation/git-add.txt | 7 +++++- builtin/add.c | 3 +++ cache.h | 2 ++ object-file.c | 2 +- read-cache.c | 3 +++ t/t2205-add-no-filters.sh | 46 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 2 deletions(-) create mode 100755 t/t2205-add-no-filters.sh diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index be5e3ac54b85..b3d7b13e83f4 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p] - [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] + [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--no-filters] [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize] [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...] @@ -183,6 +183,11 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files. in order to correct files added with wrong CRLF/LF line endings. This option implies `-u`. +--no-filters:: + Add the contents as is, ignoring any input filter that would + have been chosen by the attributes mechanism, including the end-of-line + conversion. + --chmod=(+|-)x:: Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left diff --git a/builtin/add.c b/builtin/add.c index a825887c503d..609a0e6c0157 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -29,6 +29,7 @@ static const char * const builtin_add_usage[] = { static int patch_interactive, add_interactive, edit_interactive; static int take_worktree_changes; static int add_renormalize; +static int no_filters; static int pathspec_file_nul; static const char *pathspec_from_file; static int legacy_stash_p; /* support for the scripted `git stash` */ @@ -334,6 +335,7 @@ static struct option builtin_add_options[] = { OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0), OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")), OPT_BOOL(0, "renormalize", &add_renormalize, N_("renormalize EOL of tracked files (implies -u)")), + OPT_BOOL(0 , "no-filters", &no_filters, N_("store file as is without filters")), OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")), OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")), OPT_CALLBACK_F(0, "ignore-removal", &addremove_explicit, @@ -531,6 +533,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) (show_only ? ADD_CACHE_PRETEND : 0) | (intent_to_add ? ADD_CACHE_INTENT : 0) | (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | + (no_filters ? ADD_CACHE_RAW : 0) | (!(addremove || take_worktree_changes) ? ADD_CACHE_IGNORE_REMOVAL : 0)); diff --git a/cache.h b/cache.h index d92814961405..df83b5709c32 100644 --- a/cache.h +++ b/cache.h @@ -820,6 +820,7 @@ int remove_file_from_index(struct index_state *, const char *path); #define ADD_CACHE_IGNORE_ERRORS 4 #define ADD_CACHE_IGNORE_REMOVAL 8 #define ADD_CACHE_INTENT 16 +#define ADD_CACHE_RAW 32 /* * These two are used to add the contents of the file at path * to the index, marking the working tree up-to-date by storing @@ -858,6 +859,7 @@ int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, #define HASH_WRITE_OBJECT 1 #define HASH_FORMAT_CHECK 2 #define HASH_RENORMALIZE 4 +#define HASH_RAW 8 int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags); int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags); diff --git a/object-file.c b/object-file.c index 5bcfde847188..74487c22e586 100644 --- a/object-file.c +++ b/object-file.c @@ -2067,7 +2067,7 @@ static int index_mem(struct index_state *istate, /* * Convert blobs to git internal format */ - if ((type == OBJ_BLOB) && path) { + if ((type == OBJ_BLOB) && path && !(flags & HASH_RAW)) { struct strbuf nbuf = STRBUF_INIT; if (convert_to_git(istate, path, buf, size, &nbuf, get_conv_flags(flags))) { diff --git a/read-cache.c b/read-cache.c index 29144cf879e7..0fb31201c705 100644 --- a/read-cache.c +++ b/read-cache.c @@ -716,6 +716,9 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, if (flags & ADD_CACHE_RENORMALIZE) hash_flags |= HASH_RENORMALIZE; + if (flags & ADD_CACHE_RAW) + hash_flags |= HASH_RAW; + if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) return error(_("%s: can only add regular files, symbolic links or git-directories"), path); diff --git a/t/t2205-add-no-filters.sh b/t/t2205-add-no-filters.sh new file mode 100755 index 000000000000..a897ed810827 --- /dev/null +++ b/t/t2205-add-no-filters.sh @@ -0,0 +1,46 @@ +#!/bin/sh + +test_description='git add --no-filters + +This test creates a file and a corresponding .gitattributes setup +to ensure the file undergoes a conversion when committed or checked +out. + +It then verifies that the conversion happens by default, but does not +when --no-filters is used.' + +. ./test-lib.sh + +test_expect_success setup ' + echo "* eol=crlf" > .gitattributes && + git add .gitattributes && + git commit -m initial && + printf "test\r\ntest\r\n" > test +' + +test_expect_success 'add without --no-filters' ' + original="$(git hash-object --stdin < test)" && + converted="$(git hash-object test)" && + git add test && + git ls-files -s > actual && + cat > expected <<-EOF && + 100644 $(git hash-object .gitattributes) 0 .gitattributes + 100644 $converted 0 test + EOF + test_cmp expected actual +' + +test_expect_success 'add with --no-filters' ' + git rm -f --cached test && + original="$(git hash-object --stdin < test)" && + converted="$(git hash-object test)" && + git add --no-filters test && + git ls-files -s > actual && + cat > expected <<-EOF && + 100644 $(git hash-object .gitattributes) 0 .gitattributes + 100644 $original 0 test + EOF + test_cmp expected actual +' + +test_done -- gitgitgadget
next prev parent reply other threads:[~2021-02-19 18:14 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-19 18:12 [PATCH 0/2] Add --no-filters option to git-add Andrej Shadura via GitGitGadget 2021-02-19 18:12 ` Andrej Shadura via GitGitGadget [this message] 2021-02-19 18:12 ` [PATCH 2/2] hash-object: use the new HASH_RAW flag instead of setting path to NULL Andrej Shadura via GitGitGadget 2021-02-19 22:36 ` [PATCH 0/2] Add --no-filters option to git-add brian m. carlson 2021-02-20 8:06 ` Andrej Shadura 2021-02-20 9:30 ` Andrej Shadura 2021-02-20 14:10 ` brian m. carlson 2021-02-20 17:07 ` [PATCH v2 " Andrej Shadura via GitGitGadget 2021-02-20 17:07 ` [PATCH v2 1/2] add: add option --no-filters to disable attribute-based filtering Andrej Shadura via GitGitGadget 2021-02-20 17:07 ` [PATCH v2 2/2] hash-object: use the new HASH_RAW flag instead of setting path to NULL Andrej Shadura via GitGitGadget 2021-02-20 21:34 ` [PATCH v2 0/2] Add --no-filters option to git-add 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=cf8eb886a1e29c94ee5ec070fb380d6bc36f40db.1613758333.git.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=andrew.shadura@collabora.co.uk \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH 1/2] add: add option --no-filters to disable attribute-based filtering' \ /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
Code repositories for project(s) associated with this 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).