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 1/4] status: factor two rebase-related messages together

2015-06-09 Thread Guillaume Pages
"Junio C Hamano" writes: >Hmmm, it obviously does not break anything but it is not obvious why >this is a good change. >Is it that you wanted to have a single instance of "if on a branch, >we say 'you are rebasing that branch', otherwise we say 'you are >rebasing'"? Even then, I am not sure

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: [RFC/PATCH 2/2] status: fix tests to handle new verbose git status during rebase

2015-06-03 Thread Guillaume Pages
Thanks for reviewing, I take everything into account and release a v2 ASAP. Guillaume -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [RFC/PATCH v2] create a skeleton for the command git rebase --status

2015-05-29 Thread Guillaume Pages
After this discussion I eventually agree that it would be better upgrading git status than creating a new command.When people use git status, it means that they need information to continue their work, so if you don't even know that you are in a rebase, you will very likely need information about t

[BUG] potential error in parsing git checkout options?

2015-05-29 Thread Guillaume Pages
Git version : 2.4.1.652.g8fd8657 When we run git checkout -babar, we would expect an error message like "unknown switch 'a' " and we get "Switched to a new branch 'abar'". We are not sure since we don't entirely understand the syntax -b which is shown in the documentation, but as average user

Re: [RFC/PATCH v2] create a skeleton for the command git rebase --status

2015-05-28 Thread Guillaume Pages
Hi, "Paul Tan" : > I haven't kept up with the discussion, but I'm wondering: since you > need the functionality in wt-status.c, why not implement it in git > status? In fact, git-status already shows if there is a rebase in > progress, so why not extend it to say which patch/todo line the r

Re: Implementation of git rebase --status

2015-05-26 Thread Guillaume Pages
Junio C Hamano writes: >Guillaume Pages writes: >> Do you think it could be useful or do you have any suggestion? >All of your examples say things like: >> You are in the middle of a rebase session. >> The line that paused this session is: >but what if ther

Implementation of git rebase --status

2015-05-26 Thread Guillaume Pages
Hi, I would like to implement a new command git rebase --status to inform the user about the current rebase session. Here is a sample of what I think it could look like in case of merge conflict: git rebase --status You are in the middle of a rebase session. The line that paused this sessio