Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-09 Thread Guillaume Pages
"Junio C Hamano" writes: >Guillaume Pagès writes: >> git status gives more information during rebase -i, about the list of >> command that are done during the rebase. It displays the two last >> commands executed and the two next lines to be executed. It also gives >> hints to find the whol

Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-08 Thread Junio C Hamano
Guillaume Pagès writes: > git status gives more information during rebase -i, about the list of > command that are done during the rebase. It displays the two last > commands executed and the two next lines to be executed. It also gives > hints to find the whole files in .git directory. > --- W

Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-08 Thread Matthieu Moy
Please, include a version number in the subject. git send-email -v2 does this for you. Guillaume Pagès writes: > +static void show_rebase_information(struct wt_status *s, > + struct wt_status_state *state, > + const char *color) > +

Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-05 Thread Junio C Hamano
Guillaume Pages writes: > I felt that was not the right way to do so. What do you think of a > function like that: > > /* > * Puts nb_commands commands from filename in lines, > * returns the total number of commands in the file > * ignores comments and empty lines > * lines needs to be at le

Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-05 Thread Guillaume Pages
Junio C Hamano writes >Matthieu Moy writes: >>> +void get_two_last_lines(char *filename, int *numlines, char **lines) >>> +{ >>> +... >>> +} >>> + >>> +void get_two_first_lines(char *filename, int *numlines, char **lines) >>> +{ >>> +... >>> +} >I had a handful of comments on these:

Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-04 Thread Junio C Hamano
Matthieu Moy writes: >> +void get_two_last_lines(char *filename, int *numlines, char **lines) >> +{ >> +... >> +} >> + >> +void get_two_first_lines(char *filename, int *numlines, char **lines) >> +{ >> +... >> +} I had a handful of comments on these: - Do we need two separate and overly specif

Re: [PATCH 3/4] status: give more information during rebase -i

2015-06-04 Thread Matthieu Moy
Guillaume Pagès writes: > + (use git rebase --edit-todo to view and edit) You're still missing double-quotes around "git rebase --edit-todo". Guillaume Pagès writes: > +Last command(s) done (1 command(s) done): Can't we just have "1 command"/"2 commands" instead of this (s). It's particular