skip tagging the file #176
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| diff --git a/apply.c b/apply.c | ||
| index 3de4aa4..031a6e1 100644 | ||
| --- a/apply.c | ||
| +++ b/apply.c | ||
| @@ -33,6 +33,7 @@ | ||
| #include "read-cache.h" | ||
| #include "repository.h" | ||
| #include "rerere.h" | ||
| +#include "convert.h" | ||
| #include "apply.h" | ||
| #include "entry.h" | ||
| #include "setup.h" | ||
| @@ -4446,12 +4447,23 @@ static int try_create_file(struct apply_state *state, const char *path, | ||
| if (fd < 0) | ||
| return 1; | ||
|
|
||
| - if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf, NULL)) { | ||
| +#ifdef __MVS__ | ||
| + __setfdbinary(fd); | ||
| + __disableautocvt(fd); | ||
| +#endif | ||
| + | ||
| + int ret = convert_to_working_tree(state->repo->index, path, buf, size, &nbuf, NULL); | ||
| + if (ret > 0) { | ||
| size = nbuf.len; | ||
| buf = nbuf.buf; | ||
| } | ||
|
|
||
| res = write_in_full(fd, buf, size) < 0; | ||
| + | ||
| +#ifdef __MVS__ | ||
| + tag_file_as_working_tree_encoding(state->repo->index, path, fd, ret); | ||
| +#endif | ||
| + | ||
| if (res) | ||
| error_errno(_("failed to write to '%s'"), path); | ||
| strbuf_release(&nbuf); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/builtin/cat-file.c b/builtin/cat-file.c | ||
| index df8e87a..d40b845 100644 | ||
| --- a/builtin/cat-file.c | ||
| +++ b/builtin/cat-file.c | ||
| @@ -83,7 +83,8 @@ static int filter_object(const char *path, unsigned mode, | ||
| struct checkout_metadata meta; | ||
|
|
||
| init_checkout_metadata(&meta, NULL, NULL, oid); | ||
| - if (convert_to_working_tree(the_repository->index, path, *buf, *size, &strbuf, &meta)) { | ||
| + int ret = convert_to_working_tree(the_repository->index, path, *buf, *size, &strbuf, &meta); | ||
| + if (ret > 0) { | ||
| free(*buf); | ||
| *size = strbuf.len; | ||
| *buf = strbuf_detach(&strbuf, NULL); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| diff --git a/builtin/index-pack.c b/builtin/index-pack.c | ||
| index b67fb02..1918ff3 100644 | ||
| --- a/builtin/index-pack.c | ||
| +++ b/builtin/index-pack.c | ||
| @@ -212,6 +212,9 @@ static void init_thread(void) | ||
| CALLOC_ARRAY(thread_data, nr_threads); | ||
| for (i = 0; i < nr_threads; i++) { | ||
| thread_data[i].pack_fd = xopen(curr_pack, O_RDONLY); | ||
| +#ifdef __MVS__ | ||
| + __disableautocvt(thread_data[i].pack_fd); | ||
| +#endif | ||
| } | ||
|
|
||
| threads_active = 1; | ||
| @@ -368,10 +371,17 @@ static const char *open_pack_file(const char *pack_name) | ||
| pack_name = strbuf_detach(&tmp_file, NULL); | ||
| } else { | ||
| output_fd = xopen(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600); | ||
| +#ifdef __MVS__ | ||
| + __setfdbinary(output_fd); | ||
| + __disableautocvt(output_fd); | ||
| +#endif | ||
| } | ||
| nothread_data.pack_fd = output_fd; | ||
| } else { | ||
| input_fd = xopen(pack_name, O_RDONLY); | ||
| +#ifdef __MVS__ | ||
| + __disableautocvt(input_fd); | ||
| +#endif | ||
| output_fd = -1; | ||
| nothread_data.pack_fd = input_fd; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff --git a/common-init.c b/common-init.c | ||
| index 5cc73f0..fe79089 100644 | ||
| --- a/common-init.c | ||
| +++ b/common-init.c | ||
| @@ -9,6 +9,9 @@ | ||
| #include "setup.h" | ||
| #include "strbuf.h" | ||
| #include "trace2.h" | ||
| +#ifdef __MVS__ | ||
| +#include "environment.h" | ||
| +#endif | ||
|
|
||
| /* | ||
| * Many parts of Git have subprograms communicate via pipe, expect the | ||
| @@ -37,6 +40,20 @@ void init_git(const char **argv) | ||
|
|
||
| trace2_initialize_clock(); | ||
|
|
||
| +#ifdef __MVS__ | ||
| + const char* git_utf8_ccsid_str = getenv("GIT_UTF8_CCSID"); | ||
| + | ||
| + if (git_utf8_ccsid_str != NULL) { | ||
| + char* endptr; | ||
| + errno = 0; | ||
| + long conv = strtol(git_utf8_ccsid_str, &endptr, 10); | ||
| + | ||
| + if (conv > 0 && endptr != git_utf8_ccsid_str) { | ||
| + utf8_ccsid = (int)conv; | ||
| + } | ||
| + } | ||
| +#endif | ||
| + | ||
| /* | ||
| * Always open file descriptors 0/1/2 to avoid clobbering files | ||
| * in die(). It also avoids messing up when the pipes are dup'ed |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git a/config.c b/config.c | ||
| index 7f6d53b..e497e5a 100644 | ||
| --- a/config.c | ||
| +++ b/config.c | ||
| @@ -2986,7 +2986,7 @@ int repo_config_set_multivar_in_file_gently(struct repository *r, | ||
| * The lock serves a purpose in addition to locking: the new | ||
| * contents of .git/config will be written into it. | ||
| */ | ||
| - fd = hold_lock_file_for_update(&lock, config_filename, 0); | ||
| + fd = hold_lock_file_for_update(&lock, config_filename, LOCK_TAG_TEXT); | ||
| if (fd < 0) { | ||
| error_errno(_("could not lock config file %s"), config_filename); | ||
| ret = CONFIG_NO_LOCK; | ||
| @@ -3331,7 +3331,7 @@ static int repo_config_copy_or_rename_section_in_file( | ||
| if (!config_filename) | ||
| config_filename = filename_buf = repo_git_path(r, "config"); | ||
|
|
||
| - out_fd = hold_lock_file_for_update(&lock, config_filename, 0); | ||
| + out_fd = hold_lock_file_for_update(&lock, config_filename, LOCK_TAG_TEXT); | ||
| if (out_fd < 0) { | ||
| ret = error(_("could not lock config file %s"), config_filename); | ||
| goto out; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ZOPEN_CHECK_OPTSusesmake -i test ..., which ignores test failures; this can cause CI/package builds to look successful even when the test suite is failing, making regressions easy to miss.Severity: medium
🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.