guilt icon indicating copy to clipboard operation
guilt copied to clipboard

use --no-ext-diff

Open pmolodo opened this issue 9 years ago • 5 comments

If the user has an external diff tool set up with the diff.external config setting, than many of the guilt scripts will result in empty patches (due to "git diff" generating no output!).

This can be destructive, ie, when using guilt import-commit, which will pop the commit, and then output an empty patch file!

pmolodo avatar Nov 09 '16 23:11 pmolodo

Sorry for taking so long to respond to this... I'm going to take a look at it today or tomorrow. Based on the description, it sounds reasonable.

jeffpc avatar Nov 18 '16 14:11 jeffpc

Gah! I totally forgot about this PR. Sorry about that.

The diff had only one minor issue (it removed a carriage return character from the .out file) that I can fix locally.

Other than that, the commit message needs a Signed-off-by line & a bit more content. I can do both, I just want a go-ahead to make sure you're ok with it.

Thanks, and again sorry about the delay.

jeffpc avatar Aug 12 '17 10:08 jeffpc

Actually, the merge request has a good description of the change. I'm going to use it for the commit message.

jeffpc avatar Aug 12 '17 10:08 jeffpc

.

shadowbase7 avatar Mar 08 '23 05:03 shadowbase7

Trying to collect a bit of changes and doing some fixes. See https://github.com/freddy77/guilt/. This change was merged in https://github.com/freddy77/guilt/commit/9d25c6ff282cbd176dfe80c3039f37c429df617b.

fziglio avatar Sep 24 '24 06:09 fziglio