From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2012 22:19:11 +0000 (-0700)
Subject: Merge branch 'jk/diff-no-index-pager'
X-Git-Tag: v1.7.12-rc0~77
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/defd7aa34c81148904ed5d22d975b5b3c843e040?hp=-c

Merge branch 'jk/diff-no-index-pager'

"git diff --no-index" did not work with pagers correctly.
---

defd7aa34c81148904ed5d22d975b5b3c843e040
diff --combined builtin.h
index 712c4e946c,999ba3be7c..b6cbbc9afd
--- a/builtin.h
+++ b/builtin.h
@@@ -9,6 -9,7 +9,6 @@@
  
  #define DEFAULT_MERGE_LOG_LEN 20
  
 -extern const char git_version_string[];
  extern const char git_usage_string[];
  extern const char git_more_info_string[];
  
@@@ -40,6 -41,8 +40,8 @@@ int copy_note_for_rewrite(struct notes_
  void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
  
  extern int check_pager_config(const char *cmd);
+ struct diff_options;
+ extern void setup_diff_pager(struct diff_options *);
  
  extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *buf_size);
  
@@@ -60,7 -63,6 +62,7 @@@ extern int cmd_cherry(int argc, const c
  extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
  extern int cmd_clone(int argc, const char **argv, const char *prefix);
  extern int cmd_clean(int argc, const char **argv, const char *prefix);
 +extern int cmd_column(int argc, const char **argv, const char *prefix);
  extern int cmd_commit(int argc, const char **argv, const char *prefix);
  extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_config(int argc, const char **argv, const char *prefix);
@@@ -82,6 -84,7 +84,6 @@@ extern int cmd_get_tar_commit_id(int ar
  extern int cmd_grep(int argc, const char **argv, const char *prefix);
  extern int cmd_hash_object(int argc, const char **argv, const char *prefix);
  extern int cmd_help(int argc, const char **argv, const char *prefix);
 -extern int cmd_http_fetch(int argc, const char **argv, const char *prefix);
  extern int cmd_index_pack(int argc, const char **argv, const char *prefix);
  extern int cmd_init_db(int argc, const char **argv, const char *prefix);
  extern int cmd_log(int argc, const char **argv, const char *prefix);
@@@ -106,6 -109,7 +108,6 @@@ extern int cmd_notes(int argc, const ch
  extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
  extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
  extern int cmd_patch_id(int argc, const char **argv, const char *prefix);
 -extern int cmd_pickaxe(int argc, const char **argv, const char *prefix);
  extern int cmd_prune(int argc, const char **argv, const char *prefix);
  extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
  extern int cmd_push(int argc, const char **argv, const char *prefix);
@@@ -138,6 -142,7 +140,6 @@@ extern int cmd_update_ref(int argc, con
  extern int cmd_update_server_info(int argc, const char **argv, const char *prefix);
  extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
  extern int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix);
 -extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
  extern int cmd_var(int argc, const char **argv, const char *prefix);
  extern int cmd_verify_tag(int argc, const char **argv, const char *prefix);
  extern int cmd_version(int argc, const char **argv, const char *prefix);