Re: [PATCH] git-gui: fix multi selected file operation
- From
Bert Wesarg <bert.wesarg@googlemail.com>
- Date
- Oct 17, 2011, 05:54 UTC
- Message-ID
- <CAKPyHN0iaS301r_d+kc-AVRNVKUprhdMwDpdD0HDf7nKbsPR3Q@mail.gmail.com>
- In-Reply-To
- <87ehydhnwk.fsf@fox.patthoyts.tk>
Hi,
On Sun, Oct 16, 2011 at 00:48, Pat Thoyts <patthoyts@users.sourceforge.net> wrote:
Show 31 quoted lines
> Bert Wesarg <bert.wesarg@googlemail.com> writes:
>
>>The current path for what we see the diff is not in the list of selected
>>paths. But when we add single paths (with Ctrl) to the set the current path
>>would not be used when the action is performed.
>>
>>Fix this by explicitly putting the path into the list before we start
>>showing the diff.
>>
>>Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>>---
>> git-gui.sh | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>>diff --git a/git-gui.sh b/git-gui.sh
>>index f897160..e5dd8bc 100755
>>--- a/git-gui.sh
>>+++ b/git-gui.sh
>>@@ -2474,6 +2474,7 @@ proc toggle_or_diff {w x y} {
>> [concat $after [list ui_ready]]
>> }
>> } else {
>>+ set selected_paths($path) 1
>> show_diff $path $w $lno
>> }
>> }
>
> It is not clear what I should be looking for to test this. Can you
> re-write the commit message to be more clear about what you are
> fixing. Is this multiple unstaged files in the staging box? If so I
> don't see what path display is changing.Sorry, for this bad description. I will give you a recipe here what to do to expose the problem. I try later to form this into a new commit message:
You have 2 modified, not staged files A and B. Your current view shows the diff for A. Adding B to the selection via Ctrl+Button1 and than perform the "Stage To Commit" action from the "Commit" menu results only in the staging of B.
Note, using Shift+Button1 (i.e. 'adding a range of files to the selection') results in the staging of both files A and B.
Bert
Show 5 quoted lines
> > -- > Pat Thoyts http://www.patthoyts.tk/ > PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD >