git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* git-gui patch staging errors
@ 2020-05-12  1:07 J. Paul Reed
  2020-05-12 12:15 ` Pratyush Yadav
  0 siblings, 1 reply; 7+ messages in thread
From: J. Paul Reed @ 2020-05-12  1:07 UTC (permalink / raw)
  To: git


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
https://github.com/debek/aws-glacier-multipart-upload.git and editing
glacierupload.sh; the special characters are in echo statements on lines
60, 74, and 97.

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
-- 
J. Paul Reed
https://jpaulreed.com
PGP: 0xDF8708F8


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-07-26 22:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-12  1:07 git-gui patch staging errors 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
2020-05-25 13:08       ` Pratyush Yadav
2020-07-26 22:15         ` J. Paul Reed

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).