How do git grafts and replace differ? (Are grafts now deprecated?)

by

In the same discussion about Commit Generation Number that you mention, Jakub Narębski does confirm that grafts are more aproblem than a solution:

grafts are so horrible hack that I would be not against turning off generation numbers if they are used.
In the case of replace objects you need both non-replaced and replaced
DAG generation numbers.
[…] Grafts are non-transferable, and if you use them to cull rather than add
history they are unsafe against garbage collection… I think.

(publishing has always been taken care of with git filter-branch, as illustrated by this 2008 thread on grafts workflow.)

The difference between grafts and git replace is best illustrated by this SO question “Setting git parent pointer to a different parent”, and the comments of (Jakub’s again) answer.

It does include the reference to Git1.6.5

From what I understand (from GraftPoints), git replace has superseded git grafts (assuming you have git 1.6.5 or later)

(Jakub:)

  • if you want to rewrite history then grafts + git-filter-branch (or interactive rebase, or fast-export + e.g. reposurgeon) is the way to do it.
  • If you want/need to preserve history, then git-replace is far superior to graft

More Related Contents:

  1. Error when pushing amended commit to remote [duplicate]
  2. Can git automatically switch between spaces and tabs?
  3. gitosis vs gitolite? [closed]
  4. How to do a GitHub pull request
  5. How to cherry-pick multiple commits
  6. How can I generate a Git patch for a specific commit?
  7. How do I copy a version of a single file from one Git branch to another?
  8. Git Bash is extremely slow on Windows 7 x64
  9. Branch descriptions in Git
  10. Git submodule push
  11. Recover files that were added to the index but then removed by a git reset
  12. How do I recover a dropped stash in Git?
  13. Git and the Umlaut problem on Mac OS X
  14. In the context of git (and diff), what is a “hunk”
  15. Merging without whitespace conflicts
  16. Is there a way to lock individual files or directories on fork when using git?
  17. ‘Go Get’ Private Repo from Bitbucket
  18. How to fix git error: RPC failed; curl 56 GnuTLS
  19. How to remove unused objects from a git repository?
  20. How to change commit author for multiple commits using filter branch?
  21. git reset vs git reset HEAD
  22. Error “Updates were rejected because the remote contains work that you do not have locally”
  23. main branch and ‘origin/main’ have diverged, how to ‘undiverge’ branches’?
  24. How to list all tags pointing to a specific commit in git
  25. How to use Git?
  26. How to clone git repository from its zip
  27. What constitutes a merge conflict in Git?
  28. How to install/setup TortoiseGit to work with GitHub
  29. Getting a list of all children of a given commit
  30. GitHub Api download zip or tarball link

Leave a Comment