Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use --no-ext-diff #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use --no-ext-diff #3

wants to merge 1 commit into from

Conversation

pmolodo
Copy link

@pmolodo pmolodo commented Nov 9, 2016

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!

@jeffpc
Copy link
Owner

jeffpc commented Nov 18, 2016

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
Copy link
Owner

jeffpc commented Aug 12, 2017

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
Copy link
Owner

jeffpc commented Aug 12, 2017

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

@shadowbase7
Copy link

.

@fziglio
Copy link

fziglio commented Sep 24, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants