Google Git
Sign in
googlers / jrn / git / 2210100ac00b8a46f1d94c044391bfa50b25afa4
commit2210100ac00b8a46f1d94c044391bfa50b25afa4[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Sat Jun 11 20:55:20 2005 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>Sun Jun 12 20:40:19 2005 -0700
tree76aeba1897c592e1965533a2cb8771671bd747ed
parenta7fa68c5f942706fce5636b9136d1b229e089190 [diff]
[PATCH] Fix rename/copy when dealing with temporarily broken pairs.

When rename/copy uses a file that was broken by diffcore-break
as the source, and the broken filepair gets merged back later,
the output was mislabeled as a rename.  In this case, the source
file ends up staying in the output, so we should label it as a
copy instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2 files changed
tree: 76aeba1897c592e1965533a2cb8771671bd747ed
  1. Documentation/
  2. mozilla-sha1/
  3. ppc/
  4. t/
  5. apply.c
  6. blob.c
  7. blob.h
  8. cache.h
  9. cat-file.c
  10. check-files.c
  11. checkout-cache.c
  12. commit-tree.c
  13. commit.c
  14. commit.h
  15. convert-cache.c
  16. COPYING
  17. count-delta.c
  18. count-delta.h
  19. cvs2git.c
  20. date.c
  21. delta.c
  22. delta.h
  23. diff-cache.c
  24. diff-delta.c
  25. diff-files.c
  26. diff-helper.c
  27. diff-stages.c
  28. diff-tree.c
  29. diff.c
  30. diff.h
  31. diffcore-break.c
  32. diffcore-order.c
  33. diffcore-pathspec.c
  34. diffcore-pickaxe.c
  35. diffcore-rename.c
  36. diffcore.h
  37. entry.c
  38. epoch.c
  39. epoch.h
  40. export.c
  41. fsck-cache.c
  42. get-tar-commit-id.c
  43. git
  44. git-apply-patch-script
  45. git-commit-script
  46. git-cvsimport-script
  47. git-deltafy-script
  48. git-external-diff-script
  49. git-fetch-script
  50. git-log-script
  51. git-merge-one-file-script
  52. git-prune-script
  53. git-pull-script
  54. git-resolve-script
  55. git-shortlog
  56. git-status-script
  57. git-tag-script
  58. git-whatchanged
  59. gitenv.c
  60. http-pull.c
  61. index.c
  62. init-db.c
  63. local-pull.c
  64. ls-files.c
  65. ls-tree.c
  66. Makefile
  67. merge-base.c
  68. merge-cache.c
  69. mkdelta.c
  70. mktag.c
  71. object.c
  72. object.h
  73. patch-delta.c
  74. pull.c
  75. pull.h
  76. read-cache.c
  77. read-tree.c
  78. README
  79. refs.c
  80. refs.h
  81. rev-list.c
  82. rev-tree.c
  83. rsh.c
  84. rsh.h
  85. sha1_file.c
  86. ssh-pull.c
  87. ssh-push.c
  88. strbuf.c
  89. strbuf.h
  90. stripspace.c
  91. tag.c
  92. tag.h
  93. tar-tree.c
  94. test-date.c
  95. test-delta.c
  96. tree.c
  97. tree.h
  98. unpack-file.c
  99. update-cache.c
  100. usage.c
  101. write-blob.c
  102. write-tree.c