Google Git
Sign in
googlers / jrn / git / c95b99bb5d5f3aed88f8154371a813ebd0d2fa1d
commitc95b99bb5d5f3aed88f8154371a813ebd0d2fa1d[log] [tgz]
authorJeff King <peff@peff.net>Mon May 23 16:16:59 2011 -0400
committerJunio C Hamano <gitster@pobox.com>Mon May 23 15:40:51 2011 -0700
treebd5dd1b32ac7d6b9958aa0893ce5da6cf70bdcb8
parent7c978a068f0575a90570e4579c71a5f641bdfad3 [diff]
combine-diff: calculate mode_differs earlier

One loop combined both the patch generation and checking
whether there was any mode change to report. Let's factor
that into two separate loops, as we may care about the mode
change even if we are not generating patches (e.g., because
we are showing a binary diff, which will come in a future
patch).

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