Repository navigation
Commit d04d9df
* Start fix for #1821
Assisted-by: Claude Code:claude-opus-5-5
* Keep a CRLF Gemfile CRLF when vendoring gems
Vendoring a gem into a Gemfile with CRLF line endings wrote the rewired
`gem` line, or the appended managed block, with bare LF endings, so the
committed Gemfile ended up with mixed line endings. Reverting a Gemfile
that was re-checked-out in the other style also put the original line
back in its old style, and a managed block whose endings changed was no
longer found.
New and appended lines now take the line ending of the line they
replace (or the file's), a re-vendor recognises its managed fence in a
CRLF file, and revert restores lines in the file's current style.
Fixes #1821
Assisted-by: Claude Code:claude-opus-5-5
* Test vendoring a CRLF Gemfile end to end
Adds an e2e case with a real bundler: vendoring over a CRLF Gemfile
keeps every line CRLF, a frozen install accepts the result, and revert
restores the Gemfile and lock byte for byte.
Refs #1821
Assisted-by: Claude Code:claude-opus-5-5
* Keep old vendored Gemfile lines CRLF on revert
A Gemfile vendored by an older release has an LF wired line beside a
CRLF original in the ledger. Revert now keeps the original's ending
unless the wired line's ending changed since vendor wrote it, so such
files still come back byte for byte. A hand-restored original line also
counts as reverted whatever its line ending.
Refs #1821
Assisted-by: Claude Code:claude-opus-5-5
---------
Co-authored-by: Claude <noreply@anthropic.com>
1 parent dd51a3e commit d04d9df
2 files changed
Lines changed: 304 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1941 | 1941 | | |
1942 | 1942 | | |
1943 | 1943 | | |
| 1944 | + | |
| 1945 | + | |
| 1946 | + | |
| 1947 | + | |
| 1948 | + | |
| 1949 | + | |
| 1950 | + | |
| 1951 | + | |
| 1952 | + | |
| 1953 | + | |
| 1954 | + | |
| 1955 | + | |
| 1956 | + | |
| 1957 | + | |
| 1958 | + | |
| 1959 | + | |
| 1960 | + | |
| 1961 | + | |
| 1962 | + | |
| 1963 | + | |
| 1964 | + | |
| 1965 | + | |
| 1966 | + | |
| 1967 | + | |
| 1968 | + | |
| 1969 | + | |
| 1970 | + | |
| 1971 | + | |
| 1972 | + | |
| 1973 | + | |
| 1974 | + | |
| 1975 | + | |
| 1976 | + | |
| 1977 | + | |
| 1978 | + | |
| 1979 | + | |
| 1980 | + | |
| 1981 | + | |
| 1982 | + | |
| 1983 | + | |
| 1984 | + | |
| 1985 | + | |
| 1986 | + | |
| 1987 | + | |
| 1988 | + | |
| 1989 | + | |
| 1990 | + | |
| 1991 | + | |
| 1992 | + | |
| 1993 | + | |
| 1994 | + | |
| 1995 | + | |
| 1996 | + | |
| 1997 | + | |
| 1998 | + | |
| 1999 | + | |
| 2000 | + | |
| 2001 | + | |
| 2002 | + | |
| 2003 | + | |
| 2004 | + | |
| 2005 | + | |
| 2006 | + | |
| 2007 | + | |
| 2008 | + | |
| 2009 | + | |
| 2010 | + | |
| 2011 | + | |
| 2012 | + | |
| 2013 | + | |
| 2014 | + | |
| 2015 | + | |
| 2016 | + | |
| 2017 | + | |
| 2018 | + | |
| 2019 | + | |
| 2020 | + | |
| 2021 | + | |
| 2022 | + | |
| 2023 | + | |
| 2024 | + | |
1944 | 2025 | | |
1945 | 2026 | | |
1946 | 2027 | | |
| |||
0 commit comments