Google Git
Sign in
googlers / jrn / git / 4b12dae69a41471e7c8139de26c1135f7ecccbd8
commit4b12dae69a41471e7c8139de26c1135f7ecccbd8[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Mon Oct 03 12:44:48 2005 -0700
committerJunio C Hamano <junkio@cox.net>Tue Oct 04 17:04:44 2005 -0700
tree8843ecb5e7d40236047b1364ffbd65233f666769
parent64a2228b02594d5ccb7aaca293816f571fd1ea84 [diff]
Return error when not checking out an entry due to dirtiness.

Without -f flag, 'git-checkout-index foo.c' issued an error message
when foo.c already existed in the working tree and did not match index.
However it did not return an error from the underlying checkout_entry()
function and resulted in a successful exit(0).

Signed-off-by: Junio C Hamano <junkio@cox.net>
2 files changed
tree: 8843ecb5e7d40236047b1364ffbd65233f666769
  1. arm/
  2. compat/
  3. debian/
  4. Documentation/
  5. mozilla-sha1/
  6. ppc/
  7. t/
  8. templates/
  9. .gitignore
  10. apply.c
  11. blob.c
  12. blob.h
  13. cache.h
  14. cat-file.c
  15. checkout-index.c
  16. clone-pack.c
  17. cmd-rename.sh
  18. commit-tree.c
  19. commit.c
  20. commit.h
  21. connect.c
  22. convert-objects.c
  23. COPYING
  24. count-delta.c
  25. count-delta.h
  26. csum-file.c
  27. csum-file.h
  28. daemon.c
  29. date.c
  30. delta.h
  31. diff-delta.c
  32. diff-files.c
  33. diff-index.c
  34. diff-stages.c
  35. diff-tree.c
  36. diff.c
  37. diff.h
  38. diffcore-break.c
  39. diffcore-order.c
  40. diffcore-pathspec.c
  41. diffcore-pickaxe.c
  42. diffcore-rename.c
  43. diffcore.h
  44. entry.c
  45. epoch.c
  46. epoch.h
  47. fetch-pack.c
  48. fetch.c
  49. fetch.h
  50. fsck-objects.c
  51. get-tar-commit-id.c
  52. git-add.sh
  53. git-applymbox.sh
  54. git-applypatch.sh
  55. git-archimport.perl
  56. git-bisect.sh
  57. git-branch.sh
  58. git-checkout.sh
  59. git-cherry.sh
  60. git-clone.sh
  61. git-commit.sh
  62. git-core.spec.in
  63. git-count-objects.sh
  64. git-cvsimport.perl
  65. git-diff.sh
  66. git-fetch.sh
  67. git-fmt-merge-msg.perl
  68. git-format-patch.sh
  69. git-grep.sh
  70. git-log.sh
  71. git-ls-remote.sh
  72. git-merge-octopus.sh
  73. git-merge-one-file.sh
  74. git-merge-recursive.py
  75. git-merge-resolve.sh
  76. git-merge-stupid.sh
  77. git-merge.sh
  78. git-octopus.sh
  79. git-parse-remote.sh
  80. git-prune.sh
  81. git-pull.sh
  82. git-push.sh
  83. git-rebase.sh
  84. git-relink.perl
  85. git-rename.perl
  86. git-repack.sh
  87. git-request-pull.sh
  88. git-reset.sh
  89. git-resolve.sh
  90. git-revert.sh
  91. git-send-email.perl
  92. git-sh-setup.sh
  93. git-shortlog.perl
  94. git-status.sh
  95. git-tag.sh
  96. git-verify-tag.sh
  97. git-whatchanged.sh
  98. git.sh
  99. gitk
  100. gitMergeCommon.py
  101. hash-object.c
  102. http-fetch.c
  103. ident.c
  104. index.c
  105. init-db.c
  106. INSTALL
  107. local-fetch.c
  108. ls-files.c
  109. ls-tree.c
  110. mailinfo.c
  111. mailsplit.c
  112. Makefile
  113. merge-base.c
  114. merge-index.c
  115. mktag.c
  116. object.c
  117. object.h
  118. pack-check.c
  119. pack-objects.c
  120. pack.h
  121. patch-delta.c
  122. patch-id.c
  123. path.c
  124. peek-remote.c
  125. pkt-line.c
  126. pkt-line.h
  127. prune-packed.c
  128. quote.c
  129. quote.h
  130. read-cache.c
  131. read-tree.c
  132. README
  133. receive-pack.c
  134. refs.c
  135. refs.h
  136. rev-list.c
  137. rev-parse.c
  138. rsh.c
  139. rsh.h
  140. run-command.c
  141. run-command.h
  142. send-pack.c
  143. server-info.c
  144. setup.c
  145. sha1_file.c
  146. sha1_name.c
  147. show-branch.c
  148. show-index.c
  149. ssh-fetch.c
  150. ssh-pull.c
  151. ssh-push.c
  152. ssh-upload.c
  153. strbuf.c
  154. strbuf.h
  155. stripspace.c
  156. symbolic-ref.c
  157. tag.c
  158. tag.h
  159. tar-tree.c
  160. test-date.c
  161. test-delta.c
  162. tree.c
  163. tree.h
  164. unpack-file.c
  165. unpack-objects.c
  166. update-index.c
  167. update-ref.c
  168. update-server-info.c
  169. upload-pack.c
  170. usage.c
  171. var.c
  172. verify-pack.c
  173. write-tree.c