author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sun, 19 Jun 2005 17:40:10 +0000 (10:40 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sun, 19 Jun 2005 17:40:10 +0000 (10:40 -0700) | ||
commit | b389237ae8cd04c2f53db52e37c02e30c63bcc89 | |
tree | 39a61c090453e0efd5329e5732f8c1e74f6db2ef | tree | snapshot |
parent | 1c107dc422498085493a5cccbac50096284ebe94 | commit | diff |
git-commit-tree: ignore duplicate parents
But warn about them. If somebody really ends up later wanting to
explicitly add a note that something has the same parent twice (who
knows, there are strange people around), we can add a flag to say that
it's expected and ok.
This was brought on by a commit in the kernel tree, where a repeated
merge caused a duplicate parent.
Parent duplicates aren't "wrong" per se, they're just in practice not
something you are ever interested in.
But warn about them. If somebody really ends up later wanting to
explicitly add a note that something has the same parent twice (who
knows, there are strange people around), we can add a flag to say that
it's expected and ok.
This was brought on by a commit in the kernel tree, where a repeated
merge caused a duplicate parent.
Parent duplicates aren't "wrong" per se, they're just in practice not
something you are ever interested in.
commit-tree.c | diff | blob | history |