GIT 1.6.5-rc2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkq5sk4ACgkQwMbZpPMRm5puCgCfXqz8Nj0xpdV98piy+3aiFQBg
N7AAnjSAMaiTkr4HT9/STOTTRZOnKpoe
=YP6j
-----END PGP SIGNATURE-----
pull: Clarify "helpful" message for another corner case

When the remote branch we asked for merging did not exist in the set of
fetched refs, we unconditionally hinted that it was because of lack of
configuration.  It is not necessarily so, and risks sending users for a
wild goose chase.

Make sure to check if that is indeed the case before telling a wild guess
to the user.

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