You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
It is fragile, as there is no way for the revision machinery to say "but
now I want to traverse the graph ignoring the graft file" e.g. when
pushing commits to a remote repository (which, as a consequence, can
miss commits).
And we already have a better solution with `git replace --graft <comit>
[<parent>...]`.
Changes since v4:
- Fixed resource leaks (missing free() and strbuf_release() calls when
returning an error).
- Avoided error_errno() mistakenly using close()'s errno.
- Actually close the handle to the graft file after converting it.
- Changed the description of Documentation/technical/shallow to not even
bother to describe how it might be construed to be similar to replace
refs.
Johannes Schindelin (11):
argv_array: offer to split a string by whitespace
commit: Let the callback of for_each_mergetag return on error
replace: avoid using die() to indicate a bug
replace: "libify" create_graft() and callees
replace: introduce --convert-graft-file
Add a test for `git replace --convert-graft-file`
Deprecate support for .git/info/grafts
filter-branch: stop suggesting to use grafts
technical/shallow: stop referring to grafts
technical/shallow: describe why shallow cannot use replace refs
Remove obsolete script to convert grafts to replace refs
Documentation/git-filter-branch.txt | 2 +-
Documentation/git-replace.txt | 11 +-
Documentation/technical/shallow.txt | 20 +-
advice.c | 2 +
advice.h | 1 +
argv-array.c | 20 ++
argv-array.h | 2 +
builtin/replace.c | 218 +++++++++++++++-------
commit.c | 18 +-
commit.h | 4 +-
contrib/convert-grafts-to-replace-refs.sh | 28 ---
log-tree.c | 13 +-
t/t6001-rev-list-graft.sh | 9 +
t/t6050-replace.sh | 20 ++
14 files changed, 253 insertions(+), 115 deletions(-)
delete mode 100755 contrib/convert-grafts-to-replace-refs.sh
base-commit: 1f1cddd558b54bb0ce19c8ace353fd07b758510d
Submitted-As: https://public-inbox.org/git/cover.1524650028.git.johannes.schindelin@gmx.de
In-Reply-To: https://public-inbox.org/git/cover.1524262793.git.johannes.schindelin@gmx.de
In-Reply-To: https://public-inbox.org/git/0f0942043678fe76f8d654306482ee26fac643f0.1523617836.git.johannes.schindelin@gmx.de
In-Reply-To: https://public-inbox.org/git/cover.1524125760.git.johannes.schindelin@gmx.de
In-Reply-To: https://public-inbox.org/git/cover.1524303776.git.johannes.schindelin@gmx.de