[PATCH] git-svn: Make create-ignore use git add -f

[PATCH] git-svn: Make create-ignore use git add -f

[Gustaf Hendeby]

When having a svn:ignore that ignores the .gitignore file the -f
option to git add must be used to avoid git complaining about adding
an ignored file and hence stop the process of creating .gitignores.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 81afb5c..d6d7b1a 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -612,7 +612,7 @@ sub cmd_create_ignore {
 		print GITIGNORE "$s\n";
 		close(GITIGNORE)
 		  or fatal("Failed to close `$ignore': $!");
-		command_noisy('add', $ignore);
+		command_noisy('add', '-f', $ignore);
 	});
 }
 
-- 
1.5.5.1.246.gafa4

[PATCH] Documentation: Add create-ignore to git svn manual

[Gustaf Hendeby]

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
---
 Documentation/git-svn.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index bec9acc..f4ba105 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -188,6 +188,12 @@ All arguments are passed directly to `git blame'.
 	commit.  All merging is assumed to have taken place
 	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.
+
 'show-ignore'::
 	Recursively finds and lists the svn:ignore property on
 	directories.  The output is suitable for appending to
-- 
1.5.5.1.246.gafa4

Re: [PATCH] Documentation: Add create-ignore to git svn manual

[Eric Wong]

Gustaf Hendeby <hendeby@isy.liu.se> wrote:
> 
> Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  Documentation/git-svn.txt |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index bec9acc..f4ba105 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -188,6 +188,12 @@ All arguments are passed directly to `git blame'.
>  	commit.  All merging is assumed to have taken place
>  	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.
> +
>  'show-ignore'::
>  	Recursively finds and lists the svn:ignore property on
>  	directories.  The output is suitable for appending to
> -- 
> 1.5.5.1.246.gafa4

Re: [PATCH] git-svn: Make create-ignore use git add -f

[Eric Wong]

Gustaf Hendeby <hendeby@isy.liu.se> wrote:
> When having a svn:ignore that ignores the .gitignore file the -f
> option to git add must be used to avoid git complaining about adding
> an ignored file and hence stop the process of creating .gitignores.
> 
> Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>

Acked-by: Eric Wong <normalperson@yhbt.net>
> ---
>  git-svn.perl |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index 81afb5c..d6d7b1a 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -612,7 +612,7 @@ sub cmd_create_ignore {
>  		print GITIGNORE "$s\n";
>  		close(GITIGNORE)
>  		  or fatal("Failed to close `$ignore': $!");
> -		command_noisy('add', $ignore);
> +		command_noisy('add', '-f', $ignore);
>  	});
>  }
>  
> -- 
> 1.5.5.1.246.gafa4