Google Git
Sign in
googlers / jrn / git / 9cffb8c8bfd64d97769b3e3792201bcb3618dd23
commit9cffb8c8bfd64d97769b3e3792201bcb3618dd23[log] [tgz]
authorPete Wyckoff <pw@padd.com>Sun Oct 16 10:45:01 2011 -0400
committerJunio C Hamano <gitster@pobox.com>Mon Oct 17 20:46:49 2011 -0700
tree23fa5070c8d9f15d14ac0b3c269c2248be21f0dc
parent55aa5714afc1310fd94936a8cd922e868d694bd2 [diff]
git-p4: recognize all p4 filetypes

The previous code was approximate in the filetypes it recognized.
Put in the canonical list and be more careful about matching
elements of the file type.

This might change behavior in some cases, hopefully for the
better.  Windows newline mangling will now happen on all
text files.  Previously some like "text+ko" were oddly exempt.

Files with multiple combinations of modifiers, like "text+klx",
are now recognized for keyword expansion.  I expect these to be
seen only rarely.

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