mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/am-i-v-fix'

Browse Source 
The "v(iew)" subcommand of the interactive "git am -i" command was
broken in 2.6.0 timeframe when the command was rewritten in C.

* jc/am-i-v-fix:
  am -i: fix "v"iew
  pager: factor out a helper to prepare a child process to run the pager
  pager: lose a separate argv[]
This commit is contained in:
Junio C Hamano
2016-02-24 13:26:01 -08:00
parent 595bfefa6c 708b8cc9a1
commit c3b1e8d851
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cache.h
View File

@ -229,7 +229,9 @@ struct cache_entry {
#error "CE_EXTENDED_FLAGS out of range"
#endif
/* Forward structure decls */
struct pathspec;
struct child_process;
/*
* Copy the sha1 and stat state of a cache entry from one to
@ -1685,6 +1687,7 @@ extern int pager_use_color;
extern int term_columns(void);
extern int decimal_width(uintmax_t);
extern int check_pager_config(const char *cmd);
extern void prepare_pager_args(struct child_process *, const char *pager);
extern const char *editor_program;
extern const char *askpass_program;