Google Git
Sign in
googlers / jrn / git / 0041f09de6e62efc31c860487f04e8b08bce68c8
commit0041f09de6e62efc31c860487f04e8b08bce68c8[log] [tgz]
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>Sat Dec 17 11:15:48 2011 +0100
committerJunio C Hamano <gitster@pobox.com>Sat Dec 17 18:21:37 2011 -0800
tree85d855657c9a8a94ab39a82773362e5b1abd66f6
parentee228024933069b93ce23a1bd5eeb7ae12c792f2 [diff]
use struct sha1_array in diff_tree_combined()

Maintaining an array of hashes is easier using sha1_array than
open-coding it.  This patch also fixes a leak of the SHA1 array
in  diff_tree_combined_merge().

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 files changed
tree: 85d855657c9a8a94ab39a82773362e5b1abd66f6
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. mergetools/
  11. perl/
  12. po/
  13. ppc/
  14. t/
  15. templates/
  16. vcs-svn/
  17. xdiff/
  18. RelNotes ⇨ Documentation/RelNotes/1.7.9.txt
  19. .gitattributes
  20. .gitignore
  21. .mailmap
  22. abspath.c
  23. aclocal.m4
  24. advice.c
  25. advice.h
  26. alias.c
  27. alloc.c
  28. archive-tar.c
  29. archive-zip.c
  30. archive.c
  31. archive.h
  32. argv-array.c
  33. argv-array.h
  34. attr.c
  35. attr.h
  36. base85.c
  37. bisect.c
  38. bisect.h
  39. blob.c
  40. blob.h
  41. branch.c
  42. branch.h
  43. builtin.h
  44. bulk-checkin.c
  45. bulk-checkin.h
  46. bundle.c
  47. bundle.h
  48. cache-tree.c
  49. cache-tree.h
  50. cache.h
  51. check-builtins.sh
  52. check-racy.c
  53. check_bindir
  54. color.c
  55. color.h
  56. combine-diff.c
  57. command-list.txt
  58. commit.c
  59. commit.h
  60. config.c
  61. config.mak.in
  62. configure.ac
  63. connect.c
  64. connected.c
  65. connected.h
  66. convert.c
  67. convert.h
  68. copy.c
  69. COPYING
  70. csum-file.c
  71. csum-file.h
  72. ctype.c
  73. daemon.c
  74. date.c
  75. decorate.c
  76. decorate.h
  77. delta.h
  78. diff-delta.c
  79. diff-lib.c
  80. diff-no-index.c
  81. diff.c
  82. diff.h
  83. diffcore-break.c
  84. diffcore-delta.c
  85. diffcore-order.c
  86. diffcore-pickaxe.c
  87. diffcore-rename.c
  88. diffcore.h
  89. dir.c
  90. dir.h
  91. editor.c
  92. entry.c
  93. environment.c
  94. exec_cmd.c
  95. exec_cmd.h
  96. fast-import.c
  97. fetch-pack.h
  98. fixup-builtins
  99. fmt-merge-msg.h
  100. fsck.c
  101. fsck.h
  102. generate-cmdlist.sh
  103. gettext.c
  104. gettext.h
  105. git-add--interactive.perl
  106. git-am.sh
  107. git-archimport.perl
  108. git-bisect.sh
  109. git-compat-util.h
  110. git-cvsexportcommit.perl
  111. git-cvsimport.perl
  112. git-cvsserver.perl
  113. git-difftool--helper.sh
  114. git-difftool.perl
  115. git-filter-branch.sh
  116. git-instaweb.sh
  117. git-lost-found.sh
  118. git-merge-octopus.sh
  119. git-merge-one-file.sh
  120. git-merge-resolve.sh
  121. git-mergetool--lib.sh
  122. git-mergetool.sh
  123. git-parse-remote.sh
  124. git-pull.sh
  125. git-quiltimport.sh
  126. git-rebase--am.sh
  127. git-rebase--interactive.sh
  128. git-rebase--merge.sh
  129. git-rebase.sh
  130. git-relink.perl
  131. git-remote-testgit.py
  132. git-repack.sh
  133. git-request-pull.sh
  134. git-send-email.perl
  135. git-sh-i18n.sh
  136. git-sh-setup.sh
  137. git-stash.sh
  138. git-submodule.sh
  139. git-svn.perl
  140. GIT-VERSION-GEN
  141. git-web--browse.sh
  142. git.c
  143. git.spec.in
  144. gpg-interface.c
  145. gpg-interface.h
  146. graph.c
  147. graph.h
  148. grep.c
  149. grep.h
  150. hash.c
  151. hash.h
  152. help.c
  153. help.h
  154. hex.c
  155. http-backend.c
  156. http-fetch.c
  157. http-push.c
  158. http-walker.c
  159. http.c
  160. http.h
  161. ident.c
  162. imap-send.c
  163. INSTALL
  164. kwset.c
  165. kwset.h
  166. levenshtein.c
  167. levenshtein.h
  168. LGPL-2.1
  169. list-objects.c
  170. list-objects.h
  171. ll-merge.c
  172. ll-merge.h
  173. lockfile.c
  174. log-tree.c
  175. log-tree.h
  176. mailmap.c
  177. mailmap.h
  178. Makefile
  179. match-trees.c
  180. merge-file.c
  181. merge-file.h
  182. merge-recursive.c
  183. merge-recursive.h
  184. name-hash.c
  185. notes-cache.c
  186. notes-cache.h
  187. notes-merge.c
  188. notes-merge.h
  189. notes.c
  190. notes.h
  191. object.c
  192. object.h
  193. pack-check.c
  194. pack-refs.c
  195. pack-refs.h
  196. pack-revindex.c
  197. pack-revindex.h
  198. pack-write.c
  199. pack.h
  200. pager.c
  201. parse-options-cb.c
  202. parse-options.c
  203. parse-options.h
  204. patch-delta.c
  205. patch-ids.c
  206. patch-ids.h
  207. path.c
  208. pkt-line.c
  209. pkt-line.h
  210. preload-index.c
  211. pretty.c
  212. progress.c
  213. progress.h
  214. quote.c
  215. quote.h
  216. reachable.c
  217. reachable.h
  218. read-cache.c
  219. README
  220. reflog-walk.c
  221. reflog-walk.h
  222. refs.c
  223. refs.h
  224. remote-curl.c
  225. remote.c
  226. remote.h
  227. replace_object.c
  228. rerere.c
  229. rerere.h
  230. resolve-undo.c
  231. resolve-undo.h
  232. revision.c
  233. revision.h
  234. run-command.c
  235. run-command.h
  236. send-pack.h
  237. sequencer.c
  238. sequencer.h
  239. server-info.c
  240. setup.c
  241. sh-i18n--envsubst.c
  242. sha1-array.c
  243. sha1-array.h
  244. sha1-lookup.c
  245. sha1-lookup.h
  246. sha1_file.c
  247. sha1_name.c
  248. shallow.c
  249. shell.c
  250. shortlog.h
  251. show-index.c
  252. sideband.c
  253. sideband.h
  254. sigchain.c
  255. sigchain.h
  256. strbuf.c
  257. strbuf.h
  258. streaming.c
  259. streaming.h
  260. string-list.c
  261. string-list.h
  262. submodule.c
  263. submodule.h
  264. symlinks.c
  265. tag.c
  266. tag.h
  267. tar.h
  268. test-chmtime.c
  269. test-ctype.c
  270. test-date.c
  271. test-delta.c
  272. test-dump-cache-tree.c
  273. test-genrandom.c
  274. test-index-version.c
  275. test-line-buffer.c
  276. test-match-trees.c
  277. test-mktemp.c
  278. test-obj-pool.c
  279. test-parse-options.c
  280. test-path-utils.c
  281. test-run-command.c
  282. test-sha1.c
  283. test-sha1.sh
  284. test-sigchain.c
  285. test-string-pool.c
  286. test-subprocess.c
  287. test-svn-fe.c
  288. test-treap.c
  289. thread-utils.c
  290. thread-utils.h
  291. trace.c
  292. transport-helper.c
  293. transport.c
  294. transport.h
  295. tree-diff.c
  296. tree-walk.c
  297. tree-walk.h
  298. tree.c
  299. tree.h
  300. unimplemented.sh
  301. unpack-trees.c
  302. unpack-trees.h
  303. upload-pack.c
  304. url.c
  305. url.h
  306. usage.c
  307. userdiff.c
  308. userdiff.h
  309. utf8.c
  310. utf8.h
  311. walker.c
  312. walker.h
  313. wrap-for-bin.sh
  314. wrapper.c
  315. write_or_die.c
  316. ws.c
  317. wt-status.c
  318. wt-status.h
  319. xdiff-interface.c
  320. xdiff-interface.h
  321. zlib.c