Google Git
Sign in
code / git / ee6fc514f2df821c2719cc49499a56ef2fb136b0
commitee6fc514f2df821c2719cc49499a56ef2fb136b0[log] [tgz]
authorJens Lehmann <Jens.Lehmann@web.de>Sat Jan 16 18:42:24 2010 +0100
committerJunio C Hamano <gitster@pobox.com>Sat Jan 16 16:40:50 2010 -0800
treef5aa79026dcad4897fbb0501027d70a5d8a48cd1
parent1f73566af5bec28cd8489c6139a9ede95817349c [diff]
Show submodules as modified when they contain a dirty work tree

Until now a submodule only then showed up as modified in the supermodule
when the last commit in the submodule differed from the one in the index
or the diffed against commit of the superproject. A dirty work tree
containing new untracked or modified files in a submodule was
undetectable when looking at it from the superproject.

Now git status and git diff (against the work tree) in the superproject
will also display submodules as modified when they contain untracked or
modified files, even if the compared ref matches the HEAD of the
submodule.

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