From: Junio C Hamano <gitster@pobox.com>
To: "Alex Galvin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Alex Galvin <agalvin@comqi.com>
Subject: Re: [PATCH v3] git-svn: mention `svn:global-ignores` in help+docs
Date: Wed, 14 Aug 2024 15:12:07 -0700 [thread overview]
Message-ID: <xmqqzfpewy88.fsf@gitster.g> (raw)
In-Reply-To: <pull.1766.v3.git.git.1723665790460.gitgitgadget@gmail.com> (Alex Galvin via GitGitGadget's message of "Wed, 14 Aug 2024 20:03:10 +0000")
"Alex Galvin via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Alex Galvin <agalvin@comqi.com>
>
> Git-SVN was previously taught to use the svn:global-ignores property as
> well as svn:ignore when creating or showing .gitignore files from a
> Subversion repository. However, the documentation and help message still
> only mentioned svn:ignore. Update Git-SVN's documentation and help
> command to mention support for the new property. Also capitalize the
> help message for the 'mkdirs' command, for consistency.
>
> Signed-off-by: Alex Galvin <agalvin@comqi.com>
> ---
> git-svn: mention svn:global-ignores in help+docs
Well written. Also thanks for forcing the authorship with the
additional in-body From: header. I totally missed it while reading
the last round.
Will queue. Let's mark it for 'next' soonish.
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1766%2Fav-gal%2Fgit-svn-doc-globalignores-v3
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1766/av-gal/git-svn-doc-globalignores-v3
> Pull-Request: https://github.com/git/git/pull/1766
>
> Range-diff vs v2:
>
> 1: d0b5df150e9 ! 1: a6d93512218 git-svn: mention `svn:global-ignores` in help+docs
> @@
> ## Metadata ##
> -Author: Alex Galvin <alex.v.galvin@gmail.com>
> +Author: Alex Galvin <agalvin@comqi.com>
>
> ## Commit message ##
> git-svn: mention `svn:global-ignores` in help+docs
>
> - Git-SVN was previously taught to use the svn:global-ignores attribute
> - as well as svn:ignore when creating or showing .gitignore files from a
> - Subversion repository. However, the documentation and help message
> - still only mentioned svn:ignore. This commit updates Git-SVN's
> - documentation and help command to mention support for the new attribute.
> + Git-SVN was previously taught to use the svn:global-ignores property as
> + well as svn:ignore when creating or showing .gitignore files from a
> + Subversion repository. However, the documentation and help message still
> + only mentioned svn:ignore. Update Git-SVN's documentation and help
> + command to mention support for the new property. Also capitalize the
> + help message for the 'mkdirs' command, for consistency.
>
> Signed-off-by: Alex Galvin <agalvin@comqi.com>
>
> @@ git-svn.perl: my %cmd = (
> { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
> 'create-ignore' => [ \&cmd_create_ignore,
> - 'Create a .gitignore per svn:ignore',
> -+ "Create a .gitignore per directory with an SVN ignore property",
> ++ "Create a .gitignore per directory with SVN ignore properties",
> { 'revision|r=i' => \$_revision
> } ],
> 'mkdirs' => [ \&cmd_mkdirs ,
>
>
> Documentation/git-svn.txt | 14 +++++++-------
> git-svn.perl | 6 +++---
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index 43c68c2ec44..bcf7d84a87d 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -431,14 +431,14 @@ Any other arguments are passed directly to 'git log'
> independently of 'git svn' functions.
>
> 'create-ignore'::
> - Recursively finds the svn:ignore property on directories and
> - creates matching .gitignore files. The resulting files are staged to
> - be committed, but are not committed. Use -r/--revision to refer to a
> - specific revision.
> + Recursively finds the svn:ignore and svn:global-ignores properties
> + on directories and creates matching .gitignore files. The resulting
> + files are staged to be committed, but are not committed. Use
> + -r/--revision to refer to a specific revision.
>
> 'show-ignore'::
> - Recursively finds and lists the svn:ignore property on
> - directories. The output is suitable for appending to
> + Recursively finds and lists the svn:ignore and svn:global-ignores
> + properties on directories. The output is suitable for appending to
> the $GIT_DIR/info/exclude file.
>
> 'mkdirs'::
> @@ -871,7 +871,7 @@ Tracking and contributing to the trunk of a Subversion-managed project
> # Now commit your changes (that were committed previously using Git) to SVN,
> # as well as automatically updating your working HEAD:
> git svn dcommit
> -# Append svn:ignore settings to the default Git exclude file:
> +# Append svn:ignore and svn:global-ignores settings to the default Git exclude file:
> git svn show-ignore >> .git/info/exclude
> ------------------------------------------------------------------------
>
> diff --git a/git-svn.perl b/git-svn.perl
> index a2a46608c9b..01e7a70de1c 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -219,11 +219,11 @@ my %cmd = (
> "Set an SVN repository to a git tree-ish",
> { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
> 'create-ignore' => [ \&cmd_create_ignore,
> - 'Create a .gitignore per svn:ignore',
> + "Create a .gitignore per directory with SVN ignore properties",
> { 'revision|r=i' => \$_revision
> } ],
> 'mkdirs' => [ \&cmd_mkdirs ,
> - "recreate empty directories after a checkout",
> + "Recreate empty directories after a checkout",
> { 'revision|r=i' => \$_revision } ],
> 'propget' => [ \&cmd_propget,
> 'Print the value of a property on a file or directory',
> @@ -234,7 +234,7 @@ my %cmd = (
> 'proplist' => [ \&cmd_proplist,
> 'List all properties of a file or directory',
> { 'revision|r=i' => \$_revision } ],
> - 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
> + 'show-ignore' => [ \&cmd_show_ignore, "Show .gitignore patterns from SVN ignore properties",
> { 'revision|r=i' => \$_revision
> } ],
> 'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
>
> base-commit: cabe67c0d1819fd1e33079e92615c6c7a3dc560d
prev parent reply other threads:[~2024-08-14 22:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 22:06 [PATCH] git-svn: mention `svn:globalignores` in help+docs Alex Galvin via GitGitGadget
2024-08-13 17:36 ` Junio C Hamano
2024-08-13 19:05 ` Alex Galvin
2024-08-13 19:55 ` [PATCH v2] git-svn: mention `svn:global-ignores` " Alex Galvin via GitGitGadget
2024-08-13 22:33 ` Junio C Hamano
2024-08-14 17:53 ` Alex Galvin
2024-08-14 18:55 ` Junio C Hamano
2024-08-14 20:03 ` [PATCH v3] " Alex Galvin via GitGitGadget
2024-08-14 22:12 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzfpewy88.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=agalvin@comqi.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).