Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
265fe63
skip tagging the file
HarithaIBM Mar 17, 2026
b6fe124
enable more descriptive error reporting , handling of iconv errors du…
HarithaIBM Apr 6, 2026
4a84897
Enabling tests for git, handled patch failure
HarithaIBM Apr 9, 2026
dd6e4b4
Enabled all tests
HarithaIBM Apr 13, 2026
1bb4dd2
Enabled all tests
HarithaIBM Apr 13, 2026
955f9c5
Adding tests
HarithaIBM Apr 13, 2026
eb59a72
add more tests
HarithaIBM Apr 13, 2026
a320c7d
Update buildenv
HarithaIBM Apr 13, 2026
d5edd3d
Enabled tests and fixed the exaction location of errors
HarithaIBM Apr 17, 2026
2cd92db
Update git-version to 2.54.0 from 2.53.0
Apr 21, 2026
4f9ea4b
Fix to handle openssl4.0.0 struct changes
HarithaIBM Apr 23, 2026
4e68ad0
bump patch fix
HarithaIBM May 5, 2026
e119858
Tagged the pid tempfile
HarithaIBM May 6, 2026
dafe1e8
Merge pull request #178 from zopencommunity/bump-git-version-2.54.0
HarithaIBM May 6, 2026
01b7feb
Merge upstream/main and resolve conflicts in lockfile.c.patch
HarithaIBM May 8, 2026
5232f8c
Update patches with latest fixes and merge improvements
HarithaIBM May 8, 2026
1ed4619
Update stable-patches with Python path fix and UTF-8 improvements
HarithaIBM May 13, 2026
9d97921
addressed comments
HarithaIBM May 30, 2026
c11b099
Merge pull request #176 from HarithaIBM/main
HarithaIBM Jun 3, 2026
abf8135
handled ref file tag
HarithaIBM Jun 5, 2026
88b53a2
Merge pull request #182 from HarithaIBM/main
HarithaIBM Jun 5, 2026
bd134a0
patch failure fix
HarithaIBM Jun 5, 2026
1957eca
Merge pull request #183 from HarithaIBM/main
HarithaIBM Jun 6, 2026
6111967
Added explicit zoslib linking
HarithaIBM Jun 8, 2026
b8fa371
Merge pull request #184 from HarithaIBM/main
HarithaIBM Jun 8, 2026
7d0ff62
Initial commit for 3 way merge
HarithaIBM Jun 30, 2026
bd7dbf1
added LD flags
HarithaIBM Jun 30, 2026
dcfd406
removed duplicated file
HarithaIBM Jun 30, 2026
80290d4
remove duplicate patch
HarithaIBM Jul 1, 2026
87d955f
remove duplicate patch
HarithaIBM Jul 1, 2026
ae80f04
remove duplicate patch
HarithaIBM Jul 1, 2026
83bcb66
remove duplicate patch
HarithaIBM Jul 1, 2026
a8b240b
Save local changes before syncing with upstream
HarithaIBM Jul 23, 2026
bb59a0e
Merge upstream/main into fork - keeping advanced local changes
HarithaIBM Jul 23, 2026
a6dd273
Merge branch with iconv transliteration and encoding fixes
HarithaIBM Aug 17, 2026
5b34a89
test: add comprehensive 3-way merge encoding test patch
HarithaIBM Aug 24, 2026
622c303
Add Tests 15-16: Special characters round-trip and 3-way merge
HarithaIBM Aug 26, 2026
e48c328
Add comprehensive test suite and encoding fix
HarithaIBM Sep 16, 2026
1bdc478
Fix timing issue in unpack-trees.c.patch for attribute cache invalida…
HarithaIBM Sep 16, 2026
46f5465
Update test_pull_encoding_tag_fix.sh to use ISO8859-1 instead of UTF-8
HarithaIBM Sep 16, 2026
e8ff9ed
Add comprehensive summary of the fixed git pull encoding tag bug
HarithaIBM Sep 16, 2026
abc0e4d
Document UTF-8 encoding behavior - not a bug, by design
HarithaIBM Sep 16, 2026
a37345a
Fix pipe error message - move fail_pipe label after trace2_child_exit
HarithaIBM Sep 16, 2026
d77c264
Initialize str to NULL to fix spurious pipe error messages
HarithaIBM Sep 16, 2026
bea1ac2
Fix PYTHON_PATH assignment - use direct assignment not append
HarithaIBM Sep 16, 2026
b5c888f
Fix unused fcntl_ret variable warning in entry.c.patch
HarithaIBM Sep 16, 2026
e245db9
Fix critical issues in patches and tests
HarithaIBM Sep 16, 2026
68a5f7a
Initialize bad_char_out in find_first_encoding_error
HarithaIBM Sep 16, 2026
732e715
Fix critical build and test issues
HarithaIBM Sep 16, 2026
a07ff92
Fix architectural issues in apply.c and parallel-checkout
HarithaIBM Sep 16, 2026
3e010e3
Add comprehensive tests for architectural fixes
HarithaIBM Sep 16, 2026
54fd088
Update test documentation with new architectural tests
HarithaIBM Sep 16, 2026
1785603
Add comprehensive test coverage summary
HarithaIBM Sep 16, 2026
ffbd725
Fix mandatory issues from review
HarithaIBM Sep 16, 2026
ca6a9e6
Fix unpack-trees parallel checkout timing issue
HarithaIBM Sep 16, 2026
48df7f4
Document the unpack-trees parallel checkout timing fix
HarithaIBM Sep 16, 2026
cec327e
Update test documentation - all tests now pass
HarithaIBM Sep 16, 2026
de4c4ec
Add final comprehensive test summary
HarithaIBM Sep 16, 2026
2d2cda0
Add manual build instructions
HarithaIBM Sep 16, 2026
82b2150
Add quick start guide for building
HarithaIBM Sep 16, 2026
44d6141
Document 6 intentionally skipped issues
HarithaIBM Sep 16, 2026
10aebec
Document known issue: git stash push <file> encoding tag
HarithaIBM Sep 16, 2026
15184c8
Fix git apply attribute direction - use CHECKOUT not CHECKIN
HarithaIBM Sep 16, 2026
5c57bb8
Update KNOWN_ISSUES - git stash push <file> is now FIXED
HarithaIBM Sep 16, 2026
c5ff08e
Update documentation - 15 critical fixes total
HarithaIBM Sep 16, 2026
1ddb05d
Fix GIT_ICONV_TRANSLIT environment variable precedence
HarithaIBM Sep 17, 2026
da526de
Update documentation - 16 critical fixes total
HarithaIBM Sep 17, 2026
291be2c
Update README with improved iconv_translit documentation
HarithaIBM Sep 17, 2026
4ff9640
Add iconv_translit configuration checker script
HarithaIBM Sep 17, 2026
fb4d0bb
Add complete summary of all 16 fixes
HarithaIBM Sep 17, 2026
0a3c13d
Greatly enhance iconv_translit documentation in README
HarithaIBM Sep 17, 2026
570ea2b
Add git rerere encoding bug test and documentation
HarithaIBM Sep 17, 2026
f2e2e22
Fix git rerere to respect zos-working-tree-encoding
HarithaIBM Sep 17, 2026
bb01423
Update documentation - 17 critical fixes total
HarithaIBM Sep 17, 2026
403a413
Add t0084-rerere-zos.sh test patch for rerere encoding
HarithaIBM Sep 17, 2026
6837e72
Document Git SSH encoding issue on z/OS
HarithaIBM Sep 17, 2026
9ed1854
Document Unicode unmappable character issue (U+2011)
HarithaIBM Sep 17, 2026
35d8356
Add test for unmappable Unicode characters (U+2011 issue)
HarithaIBM Sep 17, 2026
776d9e2
Add comprehensive response for U+2011 user issue
HarithaIBM Sep 17, 2026
fac0074
Complete session summary - all user issues addressed
HarithaIBM Sep 17, 2026
a0b800d
Add PLX file with NOT symbol
HarithaIBM Sep 17, 2026
54d0f62
Add comprehensive NOT symbol (¬) diagnostic and response
HarithaIBM Sep 17, 2026
bcf433c
Survey of file tagging across Git commands - Test Results
HarithaIBM Sep 17, 2026
bd85423
Live demonstration of file tagging issues - Confirmed bugs
HarithaIBM Sep 17, 2026
27f36d6
Document exact fix locations for merge-file and diff --output
HarithaIBM Sep 17, 2026
a3b269b
Add fixes and tests for merge-file and diff --output - Issues #18 & #19
HarithaIBM Sep 17, 2026
b5d9a39
Add rebuild and test instructions for new fixes
HarithaIBM Sep 17, 2026
f09189a
Complete session summary - Issues #18 & #19
HarithaIBM Sep 17, 2026
37ddc47
Add final checklist - ready for rebuild
HarithaIBM Sep 17, 2026
2990406
Analysis of other Git scenarios to test
HarithaIBM Sep 17, 2026
d85564a
Comprehensive testing of low-level Git commands - All pass!
HarithaIBM Sep 17, 2026
8e8b7ae
Update merge-file patch - tag even with conflicts
HarithaIBM Sep 17, 2026
5f5a1d1
Analysis of test failures - /tmp full + merge-file fix
HarithaIBM Sep 17, 2026
f56adde
Fix all test scripts to use local temp directory
HarithaIBM Sep 18, 2026
b203741
Complete test results - All /tmp issues fixed
HarithaIBM Sep 18, 2026
d949057
Detailed explanation of minor test issues
HarithaIBM Sep 18, 2026
d3bdf21
Deep dive into size difference issue - Test bug, not Git bug
HarithaIBM Sep 18, 2026
6b838eb
Fix test_apply_3way_ebcdic - Now passes 2/2 tests
HarithaIBM Sep 18, 2026
fdf82f0
Simplify test_apply_tagging - Now passes 1/1 test
HarithaIBM Sep 18, 2026
ed6927b
Document parallel checkout UTF-8 tagging issue - LOW priority
Sep 18, 2026
10438e2
Complete summary of all pending test failures
HarithaIBM Sep 18, 2026
7fdb767
Fix test bugs in test_all_file_writing_commands.sh and test_rerere_en…
HarithaIBM Sep 18, 2026
4da19b6
Fix test_file_tagging_survey.sh - No more hangs!
HarithaIBM Sep 18, 2026
da2e9ec
Complete summary - All test bugs fixed!
HarithaIBM Sep 18, 2026
7868af3
Explain UTF-8 handling for user's ibm-1047 configuration
HarithaIBM Sep 18, 2026
da2b8d1
Fix corrupted apply.c.patch - reconstructed from manual application
HarithaIBM Sep 18, 2026
b8c2e7d
Fix all 8 corrupt patches - manually reconstructed z/OS changes
HarithaIBM Sep 18, 2026
09bb24e
Document complete patch fix - all 9 corrupt patches resolved
HarithaIBM Sep 18, 2026
394f290
Fix utf8.c.patch - add missing output assignments
HarithaIBM Sep 18, 2026
cb46283
Fix missing implementations in convert.c and utf8.c patches
HarithaIBM Sep 18, 2026
871b5af
Fix NEL/newline regression - IBM-1047 files should not get CR before NEL
HarithaIBM Sep 21, 2026
1240d3f
Document NEL/newline regression and fix timeline
HarithaIBM Sep 21, 2026
6a2d2a0
Add round-trip conversion analysis - fix does NOT break conversion
HarithaIBM Sep 21, 2026
fdd4c8b
Add encoding impact analysis - fix only affects EBCDIC on z/OS
HarithaIBM Sep 21, 2026
8b3773b
Document .gitattributes file tag issue and corruption cascade
HarithaIBM Sep 21, 2026
68508b9
Fix #255: git diff garbled output and git stash file tag corruption
HarithaIBM Sep 21, 2026
bb31773
Update diff.c.patch to only include INPUT reading fix
HarithaIBM Sep 21, 2026
d658674
Add z/OS encoding tests for Issue #255
HarithaIBM Sep 22, 2026
ca2a169
Add .gitattributes ordering documentation and fix test expectations
HarithaIBM Sep 22, 2026
020caa8
base commit
HarithaIBM Sep 22, 2026
abc7f89
ours commit
HarithaIBM Sep 22, 2026
ca4aeab
theirs commit
HarithaIBM Sep 22, 2026
c911cd6
Add test for -text + zos-working-tree-encoding bug
HarithaIBM Sep 23, 2026
4224d44
Fix test_minus_text_encoding to use relative path to git binary
HarithaIBM Sep 23, 2026
bee4022
Add test demonstrating proper file tagging workflow
HarithaIBM Sep 23, 2026
60ce484
Fix test failures: Added diff --output tagging and binary file priority
HarithaIBM Sep 24, 2026
65255f5
Fix: -text + zos-working-tree-encoding should tag files, not treat as…
HarithaIBM Sep 25, 2026
565ddc4
Add comprehensive test suite for binary/encoding fix
HarithaIBM Sep 25, 2026
613d9e0
Fix test_file_tagging_survey: Use ISO8859-1 instead of IBM-1047
HarithaIBM Sep 28, 2026
97e853f
Add test for git stash push <file> encoding issue
HarithaIBM Sep 28, 2026
a36c33d
Add test for git rerere + cherry-pick encoding issue
HarithaIBM Sep 28, 2026
8b1b591
Add test for git apply --3way file tagging issue
HarithaIBM Sep 28, 2026
7120bfc
Fix all review comments and patch corruptions
HarithaIBM Sep 28, 2026
310b536
Fix convert.c.patch hunk header: 180 → 181 lines
HarithaIBM Sep 28, 2026
72b57a6
Remove duplicate test patches - now in t-add-zos-tests.patch
HarithaIBM Sep 28, 2026
4836c6e
Fix Issue #4: Prevent git apply crash outside repository
HarithaIBM Sep 28, 2026
92ec036
Fix apply.c.patch: Add missing newline at end of file
HarithaIBM Sep 28, 2026
c1d898e
Fix apply.c.patch: Correct hunk header line count
HarithaIBM Sep 28, 2026
504e12d
Fix apply.c.patch: Correct hunk header to 22 lines (was 18)
HarithaIBM Sep 28, 2026
963b1b5
Clean up documentation: Remove 56 session/temporary .md files
HarithaIBM Sep 29, 2026
bbb0123
Remove build artifacts and logs from repository
HarithaIBM Sep 29, 2026
f3781d9
Remove QUICK_START.md and BUILD_INSTRUCTIONS.md
HarithaIBM Sep 29, 2026
66af0c5
Remove test files: test.plx and file.txt
HarithaIBM Sep 29, 2026
e4388c9
Remove utility scripts: update_tests_tempdir.sh and fix_all_test_scri…
HarithaIBM Sep 29, 2026
58b341c
Fix test: Remove hardcoded git_working_4aug path
HarithaIBM Sep 29, 2026
20e1f70
Fix all tests to use local tmp directories instead of /tmp
HarithaIBM Sep 29, 2026
fe9ab04
Fix test_3way_merge_encodings: Remove duplicate cleanup and add exit 0
HarithaIBM Sep 29, 2026
bbe5471
Fix run_all_tests.sh: Run tests from tests/ directory
HarithaIBM Sep 29, 2026
3342af3
Fix test_3way_merge_encodings: cd out before trap cleanup
HarithaIBM Sep 29, 2026
c9d709d
Fix Test 8: Add .gitattributes for UTF-8 files
HarithaIBM Sep 29, 2026
b010450
Fix Test 8: Use -text for UTF-8 files to prevent corruption
HarithaIBM Sep 29, 2026
0acb6d1
Fix Test 8: Specify both repository and working-tree encoding for UTF-8
HarithaIBM Sep 29, 2026
d123d4b
Skip Test 8: UTF-8 multi-byte test has environmental issues
HarithaIBM Sep 29, 2026
3487650
Fix Test 8: Use hex escapes for UTF-8 characters
HarithaIBM Sep 29, 2026
c513e37
Fix Test 8: Use case-insensitive grep for hex bytes
HarithaIBM Sep 29, 2026
1a1f2af
Fix Tests 9 & 10: Use hex escapes and case-insensitive grep
HarithaIBM Sep 29, 2026
23bec71
Fix Test 15: Use cmp instead of diff -q for z/OS compatibility
HarithaIBM Sep 29, 2026
430fdcb
Fix Test 16: Use case-insensitive grep for hex checks
HarithaIBM Sep 29, 2026
d88eff3
Fix: Remove non-existent t0083 test reference from meson.build
HarithaIBM Sep 29, 2026
f529016
Fix: Add platform guards to z/OS localtime_r workaround
HarithaIBM Sep 29, 2026
ad0594e
Fix: Test suite now properly reports failures instead of always exiti…
HarithaIBM Sep 29, 2026
7de0737
Add test: git blame encoding conversion (currently failing)
HarithaIBM Sep 29, 2026
d369c3e
Fix Copilot issues: binary attribute precedence, git blame encoding, …
HarithaIBM Sep 29, 2026
88ad105
Fix tests 9, 10: Add .gitattributes encoding override and chtag for b…
HarithaIBM Sep 29, 2026
7f3732f
Fix tests 10, 11: Remove premature TEST_ROOT cleanup
HarithaIBM Sep 29, 2026
44896c6
Fix P1 review comments: Issues 4, 5, and 7
HarithaIBM Oct 14, 2026
7f9677e
Add test for Issue 3: -text + working-tree-encoding round-trip
HarithaIBM Oct 14, 2026
7939c4f
Document Issue 2: Parallel checkout limitation on z/OS
HarithaIBM Oct 14, 2026
416964e
Fix Copilot review issues: transliteration config and test improvements
HarithaIBM Oct 14, 2026
f5780cc
Fix P1 Issue 6: Tag diff/merge-file output as utf8_ccsid
HarithaIBM Oct 15, 2026
9f3adac
Fix test infrastructure and remove debug output
HarithaIBM Oct 16, 2026
f53f09d
Fix P1 auto-conversion issue and test infrastructure bugs
HarithaIBM Oct 20, 2026
d968e0c
Remove documentation .md files
HarithaIBM Oct 20, 2026
2f09de0
Remove documentation files and update stable patches
HarithaIBM Oct 22, 2026
1d979c2
Fix nullable repository access in git apply for z/OS
HarithaIBM Oct 22, 2026
7570396
Address Copilot review comments in stable patches
HarithaIBM Oct 22, 2026
ede2309
Fix Copilot review issues: filter-FD encoding propagation and lockfil…
HarithaIBM Oct 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,16 @@ v2.39.2
git-compat-util
git-manpages
git-manpages.tar.xz

# Build artifacts and logs
log.STABLE/
log.STABLE_*/
*.log
*.o
.zoslib_hooks/*.o
.zoslib_hooks/*.c

# Temporary files
*.swp
*.swo
*~
74 changes: 0 additions & 74 deletions CONTRIBUTING.md

This file was deleted.

290 changes: 0 additions & 290 deletions README.md

This file was deleted.

Loading
Loading