Merge branch 'maint'

* maint:
for-each-ref: fix objectname:short bug
tree-walk: Correct bitrotted comment about tree_entry()
Fix 'git log' early pager startup error case

diff --combined git.c
index 6fc07a568d34d50745cca26fcaf46bc99bbfceba,b83c1d17ab803ae0fa1d6c0dece43f2c0334f23d..12d2952e079103c87b1f176f6928de4f342de9b5
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -188,8 -188,7 +188,8 @@@ static int handle_alias(int *argcp, con
                }
                count = split_cmdline(alias_string, &new_argv);
                if (count < 0)
 -                      die("Bad alias.%s string", alias_command);
 +                      die("Bad alias.%s string: %s", alias_command,
 +                          split_cmdline_strerror(count));
                option_count = handle_options(&new_argv, &count, &envchanged);
                if (envchanged)
                        die("alias '%s' changes environment variables\n"
@@@ -337,7 -336,7 +337,7 @@@ static void handle_internal_command(in
                { "index-pack", cmd_index_pack },
                { "init", cmd_init_db },
                { "init-db", cmd_init_db },
-               { "log", cmd_log, RUN_SETUP | USE_PAGER },
+               { "log", cmd_log, RUN_SETUP },
                { "ls-files", cmd_ls_files, RUN_SETUP },
                { "ls-tree", cmd_ls_tree, RUN_SETUP },
                { "ls-remote", cmd_ls_remote },
@@@ -381,7 -380,7 +381,7 @@@
                { "send-pack", cmd_send_pack, RUN_SETUP },
                { "shortlog", cmd_shortlog, USE_PAGER },
                { "show-branch", cmd_show_branch, RUN_SETUP },
-               { "show", cmd_show, RUN_SETUP | USE_PAGER },
+               { "show", cmd_show, RUN_SETUP },
                { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
                { "stripspace", cmd_stripspace },
                { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
@@@ -396,7 -395,7 +396,7 @@@
                { "var", cmd_var },
                { "verify-tag", cmd_verify_tag, RUN_SETUP },
                { "version", cmd_version },
-               { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
+               { "whatchanged", cmd_whatchanged, RUN_SETUP },
                { "write-tree", cmd_write_tree, RUN_SETUP },
                { "verify-pack", cmd_verify_pack },
                { "show-ref", cmd_show_ref, RUN_SETUP },

diff --combined tree-walk.h
index 88ea7e92981375ff0313e7cd46971b4680b3eb79,f78361a676be002a36bed0f243217c4e0ae9c8d1..7e3e0b5ad16710c06464726ac04d2b1c48af3708
--- 1/tree-walk.h
--- 2/tree-walk.h
+++ b/tree-walk.h
@@@ -28,7 -28,10 +28,10 @@@ static inline int tree_entry_len(const 
  void update_tree_entry(struct tree_desc *);
  void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
  
- /* Helper function that does both of the above and returns true for success */
+ /*
+  * Helper function that does both tree_entry_extract() and update_tree_entry()
+  * and returns true for success
+  */
  int tree_entry(struct tree_desc *, struct name_entry *);
  
  void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
@@@ -45,7 -48,6 +48,7 @@@ struct traverse_info 
        unsigned long conflicts;
        traverse_callback_t fn;
        void *data;
 +      int show_all_errors;
  };
  
  int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);