Google Git
Sign in
code / git / 2cd68882ee8629f9782be017007fff4c78e45e45
commit2cd68882ee8629f9782be017007fff4c78e45e45[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Mon May 30 00:08:07 2005 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>Mon May 30 10:35:49 2005 -0700
tree8a0c8a7ec9671d06cb33bb4d91596ddb9877b961
parent9d429ff6ff2832d6e63933e6d33b8380be703017 [diff]
[PATCH] diff: fix the culling of unneeded delete record.

The commit 15d061b435a7e3b6bead39df3889f4af78c4b00a

    [PATCH] Fix the way diffcore-rename records unremoved source.

still leaves unneeded delete records in its output stream by
mistake, which was covered up by having an extra check to turn
such a delete into a no-op downstream.  Fix the check in the
diffcore-rename to simplify the output routine.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2 files changed
tree: 8a0c8a7ec9671d06cb33bb4d91596ddb9877b961
  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. date.c
  20. delta.c
  21. delta.h
  22. diff-cache.c
  23. diff-delta.c
  24. diff-files.c
  25. diff-helper.c
  26. diff-tree.c
  27. diff.c
  28. diff.h
  29. diffcore-pathspec.c
  30. diffcore-pickaxe.c
  31. diffcore-rename.c
  32. diffcore.h
  33. export.c
  34. fsck-cache.c
  35. get-tar-commit-id.c
  36. git-apply-patch-script
  37. git-deltafy-script
  38. git-external-diff-script
  39. git-fetch-script
  40. git-merge-one-file-script
  41. git-prune-script
  42. git-pull-script
  43. git-resolve-script
  44. git-tag-script
  45. git-whatchanged
  46. gitenv.c
  47. http-pull.c
  48. index.c
  49. init-db.c
  50. local-pull.c
  51. ls-files.c
  52. ls-tree.c
  53. Makefile
  54. merge-base.c
  55. merge-cache.c
  56. mkdelta.c
  57. mktag.c
  58. object.c
  59. object.h
  60. patch-delta.c
  61. pull.c
  62. pull.h
  63. read-cache.c
  64. read-tree.c
  65. README
  66. rev-list.c
  67. rev-tree.c
  68. rpull.c
  69. rpush.c
  70. rsh.c
  71. rsh.h
  72. sha1_file.c
  73. strbuf.c
  74. strbuf.h
  75. tag.c
  76. tag.h
  77. tar-tree.c
  78. test-date.c
  79. test-delta.c
  80. tree.c
  81. tree.h
  82. unpack-file.c
  83. update-cache.c
  84. usage.c
  85. write-blob.c
  86. write-tree.c