[Bug 216862] C11 conformance: cexpl() is missing

From: <bugzilla-noreply_at_freebsd.org>
Date: Fri, 05 Nov 2021 03:03:05 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216862

Warner Losh <imp@FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |imp@FreeBSD.org

--- Comment #6 from Warner Losh <imp@FreeBSD.org> ---
(In reply to Steve Kargl from comment #5)
It does pickup new files....

However, it's complicated. 'git add' puts the file into a logical staging area,
and git diff excludes those not-yet-committed-but-in-the-staging-area files by
defualt.

git diff --staged will get them, but it's not so straight forward to use.

But 'git diff HEAD' often will as well, but there's some edge cases that I
can't recall right now.

You're better off doing a 'git checkout -b new-bug' and committing it. Then you
can create your diff with 'git diff main' or better yet, you can create a patch
with all the commit data: your name, the commit message, etc' with 'git
format-patch --stdout main..new-bug > patch-file-to-upload-to-bugizlla'. This
will produce output that's suitable for others to use 'git am' to just snarf it
it into the tree. Without the --stdout, it will create a bunch of numbered
files, one per commit which is something you might not want.

Then, you can do a 'git checkout main' and get back to the pristine tree. If
time passes and you need to make a change, you can update your local main, then
use 'git rebase -i main new-bug' and it will move the change forward to the tip
of the FreeBSD tree, which will let you resolve any conflicts that may have
cropped up. git rebase also lets you curate patches since you can reword the
commit message, split apart commits, or combine different ones depending on
what's needed.

The other option is to create a pull request on github, which some find easier,
though the first time setup can be a bit weird.

-- 
You are receiving this mail because:
You are the assignee for the bug.