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

fsmonitor--daemon: on macOS support symlink #1406

Closed

Conversation

srz-zumix
Copy link

@srz-zumix srz-zumix commented Nov 6, 2022

Resolves a problem where symbolic links were not showing up in diff when created or modified.
(on macOS with git config core.fsmonitor=true)

cc: Taylor Blau me@ttaylorr.com
cc: Jeff Hostetler git@jeffhostetler.com

Resolves a problem where symbolic links were not showing up in diff when
created or modified.

kFSEventStreamEventFlagItemIsSymlink is also treated as a file update.
This is because kFSEventStreamEventFlagItemIsFile is not included in
FSEvents when creating or deleting symbolic links. For example:

$ ln -snf t test
  fsevent: '/path/to/dir/test', flags=0x40100 ItemCreated|ItemIsSymlink|
$ ln -snf ci test
  fsevent: '/path/to/dir/test', flags=0x40200 ItemIsSymlink|ItemRemoved|
  fsevent: '/path/to/dir/test', flags=0x40100 ItemCreated|ItemIsSymlink|

Signed-off-by: srz_zumix <zumix.cpp@gmail.com>
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 6, 2022

Welcome to GitGitGadget

Hi @srz-zumix, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that your Pull Request has a good description, as it will be used as cover letter. You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <revi.ewer@example.com>, Ill Takalook <ill.takalook@example.net>

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

@gitgitgadget gitgitgadget bot added the new user label Nov 6, 2022
@dscho
Copy link
Member

dscho commented Nov 7, 2022

/allow

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 7, 2022

User srz-zumix is now allowed to use GitGitGadget.

@srz-zumix
Copy link
Author

/preview

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 8, 2022

Preview email sent as pull.1406.git.1667884930833.gitgitgadget@gmail.com

@srz-zumix
Copy link
Author

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 8, 2022

Submitted as pull.1406.git.1667885119570.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1406/srz-zumix/feature/darwin_symlink-v1

To fetch this version to local tag pr-1406/srz-zumix/feature/darwin_symlink-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1406/srz-zumix/feature/darwin_symlink-v1

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 8, 2022

On the Git mailing list, Taylor Blau wrote (reply to this):

On Tue, Nov 08, 2022 at 05:25:19AM +0000, srz_zumix via GitGitGadget wrote:
> From: srz_zumix <zumix.cpp@gmail.com>
>
> Resolves a problem where symbolic links were not showing up in diff when
> created or modified.

Looks reasonable to me. Adding Jeff Hostetler (cc'd) as a possible
reviewer.

Thanks,
Taylor

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 8, 2022

User Taylor Blau <me@ttaylorr.com> has been added to the cc: list.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 8, 2022

This branch is now known as sz/macos-fsmonitor-symlinks.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 8, 2022

This patch series was integrated into seen via git@1d9e34b.

@gitgitgadget gitgitgadget bot added the seen label Nov 8, 2022
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 11, 2022

This patch series was integrated into seen via git@c573e9d.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 15, 2022

This patch series was integrated into seen via git@1cb305e.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 15, 2022

On the Git mailing list, Jeff Hostetler wrote (reply to this):

On 11/8/22 4:35 PM, Taylor Blau wrote:
> On Tue, Nov 08, 2022 at 05:25:19AM +0000, srz_zumix via GitGitGadget wrote:
>> From: srz_zumix <zumix.cpp@gmail.com>
>>
>> Resolves a problem where symbolic links were not showing up in diff when
>> created or modified.
> > Looks reasonable to me. Adding Jeff Hostetler (cc'd) as a possible
> reviewer.
> > Thanks,
> Taylor

This looks good to me too.  Thanks!

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 15, 2022

User Jeff Hostetler <git@jeffhostetler.com> has been added to the cc: list.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 15, 2022

This patch series was integrated into seen via git@ca584d2.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 15, 2022

This patch series was integrated into seen via git@5ed52af.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 15, 2022

This patch series was integrated into seen via git@2194574.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 16, 2022

This patch series was integrated into seen via git@b561c80.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 16, 2022

This patch series was integrated into seen via git@7eaa009.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 17, 2022

This patch series was integrated into seen via git@3ddcd1e.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 19, 2022

This patch series was integrated into seen via git@9d2f4f3.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 19, 2022

This patch series was integrated into seen via git@de31768.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 19, 2022

This patch series was integrated into next via git@ad972b3.

@gitgitgadget gitgitgadget bot added the next label Nov 19, 2022
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 21, 2022

This patch series was integrated into seen via git@7a99b5a.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 22, 2022

This patch series was integrated into seen via git@a19c111.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 22, 2022

This patch series was integrated into seen via git@404ced6.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 22, 2022

There was a status update in the "Cooking" section about the branch sz/macos-fsmonitor-symlinks on the Git mailing list:

Fix an issue where core.fsmonitor on macOS would not notice created
or modified symbolic links.

Will merge to 'master'.
source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com>

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 23, 2022

This patch series was integrated into seen via git@8d7b35b.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 23, 2022

This patch series was integrated into master via git@8d7b35b.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 23, 2022

This patch series was integrated into next via git@8d7b35b.

@gitgitgadget gitgitgadget bot added the master label Nov 23, 2022
@gitgitgadget gitgitgadget bot closed this Nov 23, 2022
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 23, 2022

Closed via 8d7b35b.

@srz-zumix srz-zumix deleted the feature/darwin_symlink branch November 24, 2022 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants