Google Git
Sign in
googlers / jrn / git / c1d1128bef97ae16a6740538abe5fb81c67ed239
commitc1d1128bef97ae16a6740538abe5fb81c67ed239[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Fri Apr 28 02:32:44 2006 -0700
committerJunio C Hamano <junkio@cox.net>Fri Apr 28 02:32:44 2006 -0700
tree84ca6ecab00b305d14b7604ef9c182416188dfa3
parent55e1805dffeb5d2a8ccd717b2d07ca8887436a69 [diff]
git-am --resolved: more usable error message.

After doing the hard work of hand resolving the conflicts in the
working tree, if the user forgets to run update-index to mark
the paths that have been resolved, the command gave an
unfriendly "fatal: git-write-tree: not able to write tree" error
message.  Catch the situation early and give more meaningful
message and suggestion.

Noticed and suggested by Len Brown.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: 84ca6ecab00b305d14b7604ef9c182416188dfa3
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. mozilla-sha1/
  6. ppc/
  7. t/
  8. templates/
  9. xdiff/
  10. .gitignore
  11. apply.c
  12. blame.c
  13. blob.c
  14. blob.h
  15. cache.h
  16. cat-file.c
  17. check-ref-format.c
  18. checkout-index.c
  19. clone-pack.c
  20. combine-diff.c
  21. commit-tree.c
  22. commit.c
  23. commit.h
  24. config.c
  25. connect.c
  26. convert-objects.c
  27. copy.c
  28. COPYING
  29. csum-file.c
  30. csum-file.h
  31. ctype.c
  32. daemon.c
  33. date.c
  34. delta.h
  35. describe.c
  36. diff-delta.c
  37. diff-files.c
  38. diff-index.c
  39. diff-stages.c
  40. diff-tree.c
  41. diff.c
  42. diff.h
  43. diffcore-break.c
  44. diffcore-delta.c
  45. diffcore-order.c
  46. diffcore-pickaxe.c
  47. diffcore-rename.c
  48. diffcore.h
  49. entry.c
  50. environment.c
  51. exec_cmd.c
  52. exec_cmd.h
  53. fetch-clone.c
  54. fetch-pack.c
  55. fetch.c
  56. fetch.h
  57. fsck-objects.c
  58. generate-cmdlist.sh
  59. get-tar-commit-id.c
  60. git-add.sh
  61. git-am.sh
  62. git-annotate.perl
  63. git-applymbox.sh
  64. git-applypatch.sh
  65. git-archimport.perl
  66. git-bisect.sh
  67. git-branch.sh
  68. git-checkout.sh
  69. git-cherry.sh
  70. git-clean.sh
  71. git-clone.sh
  72. git-commit.sh
  73. git-compat-util.h
  74. git-count-objects.sh
  75. git-cvsexportcommit.perl
  76. git-cvsimport.perl
  77. git-cvsserver.perl
  78. git-diff.sh
  79. git-fetch.sh
  80. git-fmt-merge-msg.perl
  81. git-format-patch.sh
  82. git-grep.sh
  83. git-lost-found.sh
  84. git-ls-remote.sh
  85. git-merge-octopus.sh
  86. git-merge-one-file.sh
  87. git-merge-ours.sh
  88. git-merge-recursive.py
  89. git-merge-resolve.sh
  90. git-merge-stupid.sh
  91. git-merge.sh
  92. git-mv.perl
  93. git-parse-remote.sh
  94. git-prune.sh
  95. git-pull.sh
  96. git-push.sh
  97. git-rebase.sh
  98. git-relink.perl
  99. git-repack.sh
  100. git-request-pull.sh
  101. git-rerere.perl
  102. git-reset.sh
  103. git-resolve.sh
  104. git-revert.sh
  105. git-rm.sh
  106. git-send-email.perl
  107. git-sh-setup.sh
  108. git-shortlog.perl
  109. git-svnimport.perl
  110. git-tag.sh
  111. git-verify-tag.sh
  112. GIT-VERSION-GEN
  113. git-whatchanged.sh
  114. git.c
  115. git.spec.in
  116. gitk
  117. gitMergeCommon.py
  118. hash-object.c
  119. http-fetch.c
  120. http-push.c
  121. http.c
  122. http.h
  123. ident.c
  124. imap-send.c
  125. index-pack.c
  126. index.c
  127. init-db.c
  128. INSTALL
  129. local-fetch.c
  130. log-tree.c
  131. log-tree.h
  132. ls-files.c
  133. ls-tree.c
  134. mailinfo.c
  135. mailsplit.c
  136. Makefile
  137. merge-base.c
  138. merge-index.c
  139. merge-tree.c
  140. mktag.c
  141. mktree.c
  142. name-rev.c
  143. object.c
  144. object.h
  145. pack-check.c
  146. pack-objects.c
  147. pack-redundant.c
  148. pack.h
  149. pager.c
  150. patch-delta.c
  151. patch-id.c
  152. path.c
  153. peek-remote.c
  154. pkt-line.c
  155. pkt-line.h
  156. prune-packed.c
  157. quote.c
  158. quote.h
  159. read-cache.c
  160. read-tree.c
  161. README
  162. receive-pack.c
  163. refs.c
  164. refs.h
  165. repo-config.c
  166. rev-list.c
  167. rev-parse.c
  168. revision.c
  169. revision.h
  170. rsh.c
  171. rsh.h
  172. run-command.c
  173. run-command.h
  174. send-pack.c
  175. server-info.c
  176. setup.c
  177. sha1_file.c
  178. sha1_name.c
  179. shell.c
  180. show-branch.c
  181. show-index.c
  182. ssh-fetch.c
  183. ssh-pull.c
  184. ssh-push.c
  185. ssh-upload.c
  186. strbuf.c
  187. strbuf.h
  188. stripspace.c
  189. symbolic-ref.c
  190. tag.c
  191. tag.h
  192. tar-tree.c
  193. tar.h
  194. test-date.c
  195. test-delta.c
  196. tree-diff.c
  197. tree-walk.c
  198. tree-walk.h
  199. tree.c
  200. tree.h
  201. unpack-file.c
  202. unpack-objects.c
  203. update-index.c
  204. update-ref.c
  205. update-server-info.c
  206. upload-pack.c
  207. usage.c
  208. var.c
  209. verify-pack.c
  210. write-tree.c
  211. xdiff-interface.c
  212. xdiff-interface.h