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

Incorrect 'permissions changed' output on macOS #751

Open
Wilfred opened this issue Aug 12, 2024 · 3 comments
Open

Incorrect 'permissions changed' output on macOS #751

Wilfred opened this issue Aug 12, 2024 · 3 comments

Comments

@Wilfred
Copy link
Owner

Wilfred commented Aug 12, 2024

No description provided.

@Wilfred
Copy link
Owner Author

Wilfred commented Aug 26, 2024

It looks like git tries to pass us the mode:

static void add_external_diff_name(struct repository *r,
				   struct strvec *argv,
				   const char *name,
				   struct diff_filespec *df)
{
	struct diff_tempfile *temp = prepare_temp_file(r, name, df);
	strvec_push(argv, temp->name);
	strvec_push(argv, temp->hex);
	strvec_push(argv, temp->mode);
}

@Wilfred
Copy link
Owner Author

Wilfred commented Aug 26, 2024

This is an issue with our git docs, where we suggest explicitly setting the difftool to difftastic with two arguments.

@Wilfred
Copy link
Owner Author

Wilfred commented Aug 28, 2024

dft = "!f() { GIT_EXTERNAL_DIFF=difft git diff --ext-diff $@; }; f"

is probably a better setting for .gitconfig

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

No branches or pull requests

1 participant