git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "J. Paul Reed" <preed@sigkill.com>
To: "Kerry, Richard" <richard.kerry@atos.net>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
	Pratyush Yadav <me@yadavpratyush.com>
Subject: Re: git-gui patch staging errors
Date: Tue, 12 May 2020 13:42:33 -0700	[thread overview]
Message-ID: <20200512204233.GA31807@sigkill.com> (raw)
In-Reply-To: <AM0PR02MB371505CA3EE36FBDB44B3A409CBE0@AM0PR02MB3715.eurprd02.prod.outlook.com>


Hey Richard,

Using your test case, I still get the error (which is, specifically an
error dialog saying:

   Failed to stage selected line.

   error: patch failed: glacierupload.sh:55
   error:glacierupload.sh: patch does not apply

Note that I'm highlighting the change in the source code, then
right-clicking it and selecting "Stage lines for commit." ("Stage hunk for
commit" also results in the error.)

If I stage the entire file by clicking on it in the upper-lefthand pane,
things work fine.

This is a Gentoo box, so I wonder I happened to build Tcl without the
appropriate unicode support (that one would find in most package-based
distros)?

In briefly digging a bit more, it would seem that git gui is foisting the
work onto "git apply" to create a patch and stage it? (If I'm reading the
source correctly, It looks like the error dialog title is from
https://github.com/prati0100/git-gui/blob/master/lib/diff.tcl#L700

and then the error strings that populate the dialog are bubbled up from git
apply.

Any ideas on what would make "git apply" potentially choke? I wonder if it
has to do with a mixed file encoding?

I tried setting both:

core.checkRoundTripEncoding true 
gui.encoding utf-8

on that repo; git gui still errored out in the same way. 

I also tried changing gui.encoding to utf-16; no dice...

To reiterate, git add -i worked fine...

best,
preed
-- 
J. Paul Reed
https://jpaulreed.com
PGP: 0xDF8708F8

On 12 May 2020 at 14:27:22, Kerry, Richard arranged the bits on my disk to say:

> 
> -----Original Message-----
> From: git-owner@vger.kernel.org <git-owner@vger.kernel.org> On Behalf Of Pratyush Yadav
> Sent: 12 May 2020 13:15
> To: J. Paul Reed <preed@sigkill.com>
> Cc: git@vger.kernel.org
> Subject: Re: git-gui patch staging errors
> 
> Hi,
> 
> On 11/05/20 06:07PM, J. Paul Reed wrote:
> > 
> > Hey all,
> > 
> > I ran into an interesting problem this week where git gui was erroring 
> > out on staging partial patches in a particular file I was working on.
> > 
> > I worked around it with "git add -i," which worked like a champ.
> > 
> > I later realized the source file has some special characters (Unicode,
> > probably) in it to print emojis (or colors or whatever fun animations 
> > the kids want on their terminals these days).
> > 
> > Interestingly, lines/hunks before the first Unicode character will 
> > partial-stage appropriately, but attempting to stage any hunks/lines 
> > after the characters produces a "Failed to stage selected line. error: 
> > patch failed ... error: ... patch does not apply" error dialog.
> > 
> > This can be reproduced by cloning
> I can't reproduce it. I cloned the repo and then edited the file at line
> 60 with a diff that looks something like:
> 
>   diff --git a/glacierupload.sh b/glacierupload.sh
>   index 3b956c7..265349b 100755
>   --- a/glacierupload.sh
>   +++ b/glacierupload.sh
>   @@ -57,7 +57,9 @@ fi
>    
>    # count the number of files that begin with "$prefix"
>    fileCount=$(ls -1 | grep "^$prefix" | wc -l)
>   -echo "📦 Glacier Upload with $AWS_PROFILE"
>   +bar
>   +echo "📦 Glacier s Upload with $AWS_PROFILE"
>   +foo
>    echo "Total parts to upload: " $fileCount
>    
>    # get the list of part files to upload.  Edit this if you chose a different prefix in the split command
> 
> I tried a bunch of combinations if partially staging parts of this diff, but everything worked fine without any error message. The emoji didn't render properly (though that might be my font's problem), but there were no problems in partial staging or unstaging.
> 
> Does this example work fine on your system or does it error out? Could you give an example diff where git-gui has problems while staging? Maybe something in your config is different?
>  
> > Removing these control characters seems to calm git gui's indigestion 
> > on this file.
> > 
> > [preed@underworld ~]$ git --version
> > git version 2.26.2
> > [preed@underworld ~]$ git gui --version git-gui version 
> > 0.21.0.66.ga5728
> > 
> > best,
> > preed
> 
> -----------------------
> 
> I've recently found  something very similar to this using the Fork Gui.  I am tempted to report it to that project, but on seeing something similar here perhaps both Fork and Gut-Gui have a similar issue relating to Gui applications for Git?
> If the chunk I want to stage includes characters  in some category [1], then an attempt to Stage that chunk will fail with a similar fault to what is described here.  (I don't have one available to me at the moment to check whether it is exactly this failure)
> I have recently found myself cutting and pasting some chunks of text from a PDF into my C++ source, and in particular that includes "handed" quotes, rather than the usual use of the usual single quote character (ie the apostrophe).  If I then use Fork's ability to Stage chunks of text containing these (or possibly not containing, but close after) I get this failure reported.
> The work-around is to do it from the command line using "git add --patch", which works fine.
> 
> Regards,
> Richard.
> 
> [1] 
> I can't be entirely sure of the category as I haven't looked for the codes yet, but it is presumably some group of characters outside the basic ASCII page.
> 
> PS Sorry about posting style, I'm using Outlook and I've yet to find a way of getting it to help out by indenting everything using ">".
> 
> 

  parent reply	other threads:[~2020-05-12 20:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-12  1:07 J. Paul Reed
2020-05-12 12:15 ` Pratyush Yadav
2020-05-12 14:27   ` Kerry, Richard
2020-05-12 19:00     ` Pratyush Yadav
2020-05-12 20:42     ` J. Paul Reed [this message]
2020-05-25 13:08       ` Pratyush Yadav
2020-07-26 22:15         ` J. Paul Reed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200512204233.GA31807@sigkill.com \
    --to=preed@sigkill.com \
    --cc=git@vger.kernel.org \
    --cc=me@yadavpratyush.com \
    --cc=richard.kerry@atos.net \
    --subject='Re: git-gui patch staging errors' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).