Google Git
Sign in
googlers / jrn / git / f5ed3b30e0091421408a0119fa75148955c4fc6a
commitf5ed3b30e0091421408a0119fa75148955c4fc6a[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Thu Feb 21 11:33:56 2008 -0800
committerJunio C Hamano <gitster@pobox.com>Thu Feb 21 11:45:22 2008 -0800
treefe773298208212fefd640a5df44b51287cbdee41
parent2cd5dfd240ecb63c77bcb2532664984e3b69ae47 [diff]
git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()

When invalidating unmerged entries in the index, we used to set
their ce_mode to 0 to note the fact that they do not matter
anymore which also made sure that later unpack_trees() call
would not reuse them.  Instead just remove them from the index.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 files changed
tree: fe773298208212fefd640a5df44b51287cbdee41
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitk-git/
  7. gitweb/
  8. mozilla-sha1/
  9. perl/
  10. ppc/
  11. t/
  12. templates/
  13. xdiff/
  14. RelNotes ⇨ Documentation/RelNotes-1.5.5.txt
  15. .gitattributes
  16. .gitignore
  17. .mailmap
  18. alloc.c
  19. archive-tar.c
  20. archive-zip.c
  21. archive.c
  22. archive.h
  23. attr.c
  24. attr.h
  25. base85.c
  26. blob.c
  27. blob.h
  28. builtin-add.c
  29. builtin-annotate.c
  30. builtin-apply.c
  31. builtin-archive.c
  32. builtin-blame.c
  33. builtin-branch.c
  34. builtin-bundle.c
  35. builtin-cat-file.c
  36. builtin-check-attr.c
  37. builtin-check-ref-format.c
  38. builtin-checkout-index.c
  39. builtin-clean.c
  40. builtin-commit-tree.c
  41. builtin-commit.c
  42. builtin-config.c
  43. builtin-count-objects.c
  44. builtin-describe.c
  45. builtin-diff-files.c
  46. builtin-diff-index.c
  47. builtin-diff-tree.c
  48. builtin-diff.c
  49. builtin-fast-export.c
  50. builtin-fetch--tool.c
  51. builtin-fetch-pack.c
  52. builtin-fetch.c
  53. builtin-fmt-merge-msg.c
  54. builtin-for-each-ref.c
  55. builtin-fsck.c
  56. builtin-gc.c
  57. builtin-grep.c
  58. builtin-http-fetch.c
  59. builtin-init-db.c
  60. builtin-log.c
  61. builtin-ls-files.c
  62. builtin-ls-remote.c
  63. builtin-ls-tree.c
  64. builtin-mailinfo.c
  65. builtin-mailsplit.c
  66. builtin-merge-base.c
  67. builtin-merge-file.c
  68. builtin-merge-ours.c
  69. builtin-mv.c
  70. builtin-name-rev.c
  71. builtin-pack-objects.c
  72. builtin-pack-refs.c
  73. builtin-prune-packed.c
  74. builtin-prune.c
  75. builtin-push.c
  76. builtin-read-tree.c
  77. builtin-reflog.c
  78. builtin-rerere.c
  79. builtin-reset.c
  80. builtin-rev-list.c
  81. builtin-rev-parse.c
  82. builtin-revert.c
  83. builtin-rm.c
  84. builtin-send-pack.c
  85. builtin-shortlog.c
  86. builtin-show-branch.c
  87. builtin-show-ref.c
  88. builtin-stripspace.c
  89. builtin-symbolic-ref.c
  90. builtin-tag.c
  91. builtin-tar-tree.c
  92. builtin-unpack-objects.c
  93. builtin-update-index.c
  94. builtin-update-ref.c
  95. builtin-upload-archive.c
  96. builtin-verify-pack.c
  97. builtin-verify-tag.c
  98. builtin-write-tree.c
  99. builtin.h
  100. bundle.c
  101. bundle.h
  102. cache-tree.c
  103. cache-tree.h
  104. cache.h
  105. check-builtins.sh
  106. check-racy.c
  107. color.c
  108. color.h
  109. combine-diff.c
  110. command-list.txt
  111. commit.c
  112. commit.h
  113. config.c
  114. config.mak.in
  115. configure.ac
  116. connect.c
  117. convert.c
  118. copy.c
  119. COPYING
  120. csum-file.c
  121. csum-file.h
  122. ctype.c
  123. daemon.c
  124. date.c
  125. decorate.c
  126. decorate.h
  127. delta.h
  128. diff-delta.c
  129. diff-lib.c
  130. diff.c
  131. diff.h
  132. diffcore-break.c
  133. diffcore-delta.c
  134. diffcore-order.c
  135. diffcore-pickaxe.c
  136. diffcore-rename.c
  137. diffcore.h
  138. dir.c
  139. dir.h
  140. dump-cache-tree.c
  141. entry.c
  142. environment.c
  143. exec_cmd.c
  144. exec_cmd.h
  145. fast-import.c
  146. fetch-pack.h
  147. fixup-builtins
  148. generate-cmdlist.sh
  149. git-add--interactive.perl
  150. git-am.sh
  151. git-archimport.perl
  152. git-bisect.sh
  153. git-checkout.sh
  154. git-clone.sh
  155. git-compat-util.h
  156. git-cvsexportcommit.perl
  157. git-cvsimport.perl
  158. git-cvsserver.perl
  159. git-filter-branch.sh
  160. git-instaweb.sh
  161. git-lost-found.sh
  162. git-merge-octopus.sh
  163. git-merge-one-file.sh
  164. git-merge-resolve.sh
  165. git-merge-stupid.sh
  166. git-merge.sh
  167. git-mergetool.sh
  168. git-parse-remote.sh
  169. git-pull.sh
  170. git-quiltimport.sh
  171. git-rebase--interactive.sh
  172. git-rebase.sh
  173. git-relink.perl
  174. git-remote.perl
  175. git-repack.sh
  176. git-request-pull.sh
  177. git-send-email.perl
  178. git-sh-setup.sh
  179. git-stash.sh
  180. git-submodule.sh
  181. git-svn.perl
  182. GIT-VERSION-GEN
  183. git-web--browse.sh
  184. git.c
  185. git.spec.in
  186. grep.c
  187. grep.h
  188. hash-object.c
  189. hash.c
  190. hash.h
  191. help.c
  192. http-push.c
  193. http-walker.c
  194. http.c
  195. http.h
  196. ident.c
  197. imap-send.c
  198. index-pack.c
  199. INSTALL
  200. interpolate.c
  201. interpolate.h
  202. list-objects.c
  203. list-objects.h
  204. lockfile.c
  205. log-tree.c
  206. log-tree.h
  207. mailmap.c
  208. mailmap.h
  209. Makefile
  210. match-trees.c
  211. merge-file.c
  212. merge-index.c
  213. merge-recursive.c
  214. merge-tree.c
  215. mktag.c
  216. mktree.c
  217. object-refs.c
  218. object.c
  219. object.h
  220. pack-check.c
  221. pack-redundant.c
  222. pack-write.c
  223. pack.h
  224. pager.c
  225. parse-options.c
  226. parse-options.h
  227. patch-delta.c
  228. patch-id.c
  229. patch-ids.c
  230. patch-ids.h
  231. path-list.c
  232. path-list.h
  233. path.c
  234. pkt-line.c
  235. pkt-line.h
  236. pretty.c
  237. progress.c
  238. progress.h
  239. quote.c
  240. quote.h
  241. reachable.c
  242. reachable.h
  243. read-cache.c
  244. README
  245. receive-pack.c
  246. reflog-walk.c
  247. reflog-walk.h
  248. refs.c
  249. refs.h
  250. remote.c
  251. remote.h
  252. revision.c
  253. revision.h
  254. run-command.c
  255. run-command.h
  256. send-pack.h
  257. server-info.c
  258. setup.c
  259. sha1_file.c
  260. sha1_name.c
  261. shallow.c
  262. shell.c
  263. show-index.c
  264. sideband.c
  265. sideband.h
  266. strbuf.c
  267. strbuf.h
  268. symlinks.c
  269. tag.c
  270. tag.h
  271. tar.h
  272. test-absolute-path.c
  273. test-chmtime.c
  274. test-date.c
  275. test-delta.c
  276. test-genrandom.c
  277. test-match-trees.c
  278. test-parse-options.c
  279. test-sha1.c
  280. test-sha1.sh
  281. trace.c
  282. transport.c
  283. transport.h
  284. tree-diff.c
  285. tree-walk.c
  286. tree-walk.h
  287. tree.c
  288. tree.h
  289. unpack-file.c
  290. unpack-trees.c
  291. unpack-trees.h
  292. update-server-info.c
  293. upload-pack.c
  294. usage.c
  295. utf8.c
  296. utf8.h
  297. var.c
  298. walker.c
  299. walker.h
  300. write_or_die.c
  301. ws.c
  302. wt-status.c
  303. wt-status.h
  304. xdiff-interface.c
  305. xdiff-interface.h