threads / patch / 37155

patchgit-svn: doublecheck if really file or dir

Subject: [PATCH] git-svn: doublecheck if really file or dir

## tl;dr

2 messages between Jul 18, 2014 and Jul 18, 2014. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Andrej Manduch· Jul 18, 2014, 04:05 UTC · lore

* this fixes 'git svn info `pwd`' buggy behaviour

Signed-off-by: Andrej Manduch <amanduch@gmail.com>
---
 git-svn.perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-svn.perl +1 −1

diff --git a/git-svn.perl b/git-svn.perl
index 0a32372..c3d893e 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2029,7 +2029,7 @@ sub find_file_type_and_diff_status {
 	my $mode = (split(' ', $ls_tree))[0] || "";
 
 	return ("link", $diff_status) if $mode eq "120000";
-	return ("dir", $diff_status) if $mode eq "040000";
+	return ("dir", $diff_status) if $mode eq "040000" od -d $path;
 	return ("file", $diff_status);
 }

-- 
2.0.0.GIT

Andrej Manduch· Jul 18, 2014, 04:22 UTC · re: Andrej Manduch · lore

Re: [PATCH] git-svn: doublecheck if really file or dir

I'm sorry, i've made mistake in this one. Please ingnore it. Correct patch is on the way.

kind regards, b.

On Fri, Jul 18, 2014 at 6:05 AM, Andrej Manduch <amanduch@gmail.com> wrote:

Show 23 quoted lines

> * this fixes 'git svn info `pwd`' buggy behaviour
>
> Signed-off-by: Andrej Manduch <amanduch@gmail.com>
> ---
>  git-svn.perl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 0a32372..c3d893e 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -2029,7 +2029,7 @@ sub find_file_type_and_diff_status {
>         my $mode = (split(' ', $ls_tree))[0] || "";
>
>         return ("link", $diff_status) if $mode eq "120000";
> -       return ("dir", $diff_status) if $mode eq "040000";
> +       return ("dir", $diff_status) if $mode eq "040000" od -d $path;
>         return ("file", $diff_status);
>  }
>
> --
> 2.0.0.GIT
>