[PATCH] safe_create_leading_directories: fix race that could give a false negative
If two processes are racing to create the same directory tree, they will
both see that the directory doesn't exist, both try to mkdir(), and one
of them will fail. This is okay, as we only care that the directory
gets created. So, we add a check for EEXIST from mkdir, and continue if
the directory now exists.
Signed-off-by: Steven Walter stevenrwal...@gmail.com
---
sha1_file.c |9 +
1 file changed, 9 insertions(+)
diff --git a/sha1_file.c b/sha1_file.c
index 40b2329..5668ecc 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -123,6 +123,15 @@ int safe_create_leading_directories(char *path)
}
}
else if (mkdir(path, 0777)) {
+ if (errno == EEXIST) {
+ /*
+* We could be racing with another process to
+* create the directory. As long as the
+* directory gets created, we don't care.
+*/
+ if (stat(path, st) S_ISDIR(st.st_mode))
+ continue;
+ }
*pos = '/';
return -1;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] safe_create_leading_directories: fix race that could give a false negative
If two processes are racing to create the same directory tree, they will
both see that the directory doesn't exist, both try to mkdir(), and one
of them will fail. This is okay, as we only care that the directory
gets created. So, we add a check for EEXIST from mkdir, and continue if
the directory now exists.
---
sha1_file.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/sha1_file.c b/sha1_file.c
index 40b2329..c7b7fec 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -123,6 +123,13 @@ int safe_create_leading_directories(char *path)
}
}
else if (mkdir(path, 0777)) {
+ if (errno == EEXIST) {
+ /* We could be racing with another process to
+* create the directory. As long as the
+* directory gets created, we don't care. */
+ if (stat(path, st) S_ISDIR(st.st_mode))
+ continue;
+ }
*pos = '/';
return -1;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
Consider the case where you have trunk, branch1 of trunk, and branch2 of
branch1. trunk is merged back into branch2, and then branch2 is
reintegrated into trunk. The merge of branch2 into trunk will have
svn:mergeinfo property references to both branch1 and branch2. When
git-svn fetches the commit that merges branch2 (check_cherry_pick),
it is necessary to eliminate the merged contents of branch1 as well as
branch2, or else the merge will be incorrectly ignored as a cherry-pick.
Signed-off-by: Steven Walter stevenrwal...@gmail.com
---
perl/Git/SVN.pm |8 ++-
t/t9165-git-svn-fetch-merge-branch-of-branch.sh | 60 +++
2 files changed, 63 insertions(+), 5 deletions(-)
create mode 100755 t/t9165-git-svn-fetch-merge-branch-of-branch.sh
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 8478d0c..2707003 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1695,14 +1695,14 @@ sub find_extra_svn_parents {
my @merge_tips;
my $url = $self-{url};
my $uuid = $self-ra_uuid;
- my %ranges;
+ my @all_ranges;
for my $merge ( @merges ) {
my ($tip_commit, @ranges) =
lookup_svn_merge( $uuid, $url, $merge );
unless (!$tip_commit or
grep { $_ eq $tip_commit } @$parents ) {
push @merge_tips, $tip_commit;
- $ranges{$tip_commit} = \@ranges;
+ push @all_ranges, @ranges;
} else {
push @merge_tips, undef;
}
@@ -1717,8 +1717,6 @@ sub find_extra_svn_parents {
my $spec = shift @merges;
next unless $merge_tip and $excluded{$merge_tip};
- my $ranges = $ranges{$merge_tip};
-
# check out 'new' tips
my $merge_base;
eval {
@@ -1740,7 +1738,7 @@ sub find_extra_svn_parents {
my (@incomplete) = check_cherry_pick(
$merge_base, $merge_tip,
$parents,
- @$ranges,
+ @all_ranges,
);
if ( @incomplete ) {
diff --git a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
new file mode 100755
index 000..13ae7e3
--- /dev/null
+++ b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Steven Walter
+#
+
+test_description='git svn merge detection'
+. ./lib-git-svn.sh
+
+svn_ver=$(svn --version --quiet)
+case $svn_ver in
+0.* | 1.[0-4].*)
+ skip_all=skipping git-svn test - SVN too old ($svn_ver)
+ test_done
+ ;;
+esac
+
+test_expect_success 'initialize source svn repo' '
+ svn_cmd mkdir -m x $svnrepo/trunk
+ svn_cmd mkdir -m x $svnrepo/branches
+ svn_cmd co $svnrepo/trunk $SVN_TREE
+ (
+ cd $SVN_TREE
+ touch foo
+ svn_cmd add foo
+ svn_cmd commit -m initial commit
+ svn_cmd cp -m branch $svnrepo/trunk
$svnrepo/branches/branch1
+ svn_cmd switch $svnrepo/branches/branch1
+ touch bar
+ svn_cmd add bar
+ svn_cmd commit -m branch1
+ svn_cmd cp -m branch $svnrepo/branches/branch1
$svnrepo/branches/branch2
+ svn_cmd switch $svnrepo/branches/branch2
+ touch baz
+ svn_cmd add baz
+ svn_cmd commit -m branch2
+ svn_cmd switch $svnrepo/trunk
+ touch bar2
+ svn_cmd add bar2
+ svn_cmd commit -m trunk
+ svn_cmd switch $svnrepo/branches/branch2
+ svn_cmd merge $svnrepo/trunk
+ svn_cmd commit -m merge trunk
+ svn_cmd switch $svnrepo/trunk
+ svn_cmd merge --reintegrate $svnrepo/branches/branch2
+ svn_cmd commit -m merge branch2
+ )
+ rm -rf $SVN_TREE
+'
+
+test_expect_success 'clone svn repo' '
+ git svn init -s $svnrepo
+ git svn fetch
+'
+
+test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2)
+ y=$(git rev-parse branch2)
+ test x$x = x$y
+'
+
+test_done
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] git-svn.perl: keep processing all commits in parents_exclude
This fixes a bug where git finds the incorrect merge parent. Consider a
repository with trunk, branch1 of trunk, and branch2 of branch1.
Without this change, git interprets a merge of branch2 into trunk as a
merge of branch1 into trunk.
Signed-off-by: Steven Walter stevenrwal...@gmail.com
---
perl/Git/SVN.pm |1 -
t/t9166-git-svn-fetch-merge-branch-of-branch2.sh | 53 ++
2 files changed, 53 insertions(+), 1 deletion(-)
create mode 100755 t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 2707003..e48ba46 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1661,7 +1661,6 @@ sub parents_exclude {
if ( $commit eq $excluded ) {
push @excluded, $commit;
$found++;
- last;
}
else {
push @new, $commit;
diff --git a/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
new file mode 100755
index 000..af0ec0e
--- /dev/null
+++ b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Steven Walter
+#
+
+test_description='git svn merge detection'
+. ./lib-git-svn.sh
+
+svn_ver=$(svn --version --quiet)
+case $svn_ver in
+0.* | 1.[0-4].*)
+ skip_all=skipping git-svn test - SVN too old ($svn_ver)
+ test_done
+ ;;
+esac
+
+test_expect_success 'initialize source svn repo' '
+ svn_cmd mkdir -m x $svnrepo/trunk
+ svn_cmd mkdir -m x $svnrepo/branches
+ svn_cmd co $svnrepo/trunk $SVN_TREE
+ (
+ cd $SVN_TREE
+ touch foo
+ svn_cmd add foo
+ svn_cmd commit -m initial commit
+ svn_cmd cp -m branch $svnrepo/trunk
$svnrepo/branches/branch1
+ svn_cmd switch $svnrepo/branches/branch1
+ touch bar
+ svn_cmd add bar
+ svn_cmd commit -m branch1
+ svn_cmd cp -m branch $svnrepo/branches/branch1
$svnrepo/branches/branch2
+ svn_cmd switch $svnrepo/branches/branch2
+ touch baz
+ svn_cmd add baz
+ svn_cmd commit -m branch2
+ svn_cmd switch $svnrepo/trunk
+ svn_cmd merge --reintegrate $svnrepo/branches/branch2
+ svn_cmd commit -m merge branch2
+ )
+ rm -rf $SVN_TREE
+'
+
+test_expect_success 'clone svn repo' '
+ git svn init -s $svnrepo
+ git svn fetch
+'
+
+test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2)
+ y=$(git rev-parse branch2)
+ test x$x = x$y
+'
+
+test_done
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude
On Sat, Aug 18, 2012 at 3:51 PM, Sam Vilain s...@vilain.net wrote:
On 08/11/2012 10:14 AM, Steven Walter wrote:
This fixes a bug where git finds the incorrect merge parent. Consider a
repository with trunk, branch1 of trunk, and branch2 of branch1.
Without this change, git interprets a merge of branch2 into trunk as a
merge of branch1 into trunk.
Signed-off-by: Steven Walter stevenrwal...@gmail.com
---
git-svn.perl |1 -
t/t9164-git-svn-fetch-merge-branch-of-branch2.sh | 53
++
2 files changed, 53 insertions(+), 1 deletion(-)
create mode 100755 t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
diff --git a/git-svn.perl b/git-svn.perl
index abcec11..c4678c1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3623,7 +3623,6 @@ sub parents_exclude {
if ( $commit eq $excluded ) {
push @excluded, $commit;
$found++;
- last;
}
I could believe that, too. I like this change: one line of code, 53 lines
of test and a paragraph of explanation :-).
How about a Signed-Off-By?
--
-Steven Walter stevenrwal...@gmail.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude
This fixes a bug where git finds the incorrect merge parent. Consider a
repository with trunk, branch1 of trunk, and branch2 of branch1.
Without this change, git interprets a merge of branch2 into trunk as a
merge of branch1 into trunk.
Signed-off-by: Steven Walter stevenrwal...@gmail.com
---
git-svn.perl |1 -
t/t9164-git-svn-fetch-merge-branch-of-branch2.sh | 53 ++
2 files changed, 53 insertions(+), 1 deletion(-)
create mode 100755 t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
diff --git a/git-svn.perl b/git-svn.perl
index abcec11..c4678c1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3623,7 +3623,6 @@ sub parents_exclude {
if ( $commit eq $excluded ) {
push @excluded, $commit;
$found++;
- last;
}
else {
push @new, $commit;
diff --git a/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
new file mode 100755
index 000..af0ec0e
--- /dev/null
+++ b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Steven Walter
+#
+
+test_description='git svn merge detection'
+. ./lib-git-svn.sh
+
+svn_ver=$(svn --version --quiet)
+case $svn_ver in
+0.* | 1.[0-4].*)
+ skip_all=skipping git-svn test - SVN too old ($svn_ver)
+ test_done
+ ;;
+esac
+
+test_expect_success 'initialize source svn repo' '
+ svn_cmd mkdir -m x $svnrepo/trunk
+ svn_cmd mkdir -m x $svnrepo/branches
+ svn_cmd co $svnrepo/trunk $SVN_TREE
+ (
+ cd $SVN_TREE
+ touch foo
+ svn_cmd add foo
+ svn_cmd commit -m initial commit
+ svn_cmd cp -m branch $svnrepo/trunk
$svnrepo/branches/branch1
+ svn_cmd switch $svnrepo/branches/branch1
+ touch bar
+ svn_cmd add bar
+ svn_cmd commit -m branch1
+ svn_cmd cp -m branch $svnrepo/branches/branch1
$svnrepo/branches/branch2
+ svn_cmd switch $svnrepo/branches/branch2
+ touch baz
+ svn_cmd add baz
+ svn_cmd commit -m branch2
+ svn_cmd switch $svnrepo/trunk
+ svn_cmd merge --reintegrate $svnrepo/branches/branch2
+ svn_cmd commit -m merge branch2
+ )
+ rm -rf $SVN_TREE
+'
+
+test_expect_success 'clone svn repo' '
+ git svn init -s $svnrepo
+ git svn fetch
+'
+
+test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2)
+ y=$(git rev-parse branch2)
+ test x$x = x$y
+'
+
+test_done
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
Consider the case where you have trunk, branchA of trunk, and branchB of
branchA. trunk is merged back into branchB, and then branchB is
reintegrated into trunk. The merge of branchB into trunk will have
svn:mergeinfo property references to both branchA and branchB. When
performing the check_cherry_pick check on branchB, it is necessary to
eliminate the merged contents of branchA as well as branchB, or else the
merge will be incorrectly ignored as a cherry-pick.
Signed-off-by: Steven Walter stevenrwal...@gmail.com
---
git-svn.perl|8 ++-
t/t9163-git-svn-fetch-merge-branch-of-branch.sh | 60 +++
2 files changed, 63 insertions(+), 5 deletions(-)
create mode 100755 t/t9163-git-svn-fetch-merge-branch-of-branch.sh
diff --git a/git-svn.perl b/git-svn.perl
index ca038ec..abcec11 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3657,14 +3657,14 @@ sub find_extra_svn_parents {
my @merge_tips;
my $url = $self-{url};
my $uuid = $self-ra_uuid;
- my %ranges;
+ my @all_ranges;
for my $merge ( @merges ) {
my ($tip_commit, @ranges) =
lookup_svn_merge( $uuid, $url, $merge );
unless (!$tip_commit or
grep { $_ eq $tip_commit } @$parents ) {
push @merge_tips, $tip_commit;
- $ranges{$tip_commit} = \@ranges;
+ push @all_ranges, @ranges;
} else {
push @merge_tips, undef;
}
@@ -3679,8 +3679,6 @@ sub find_extra_svn_parents {
my $spec = shift @merges;
next unless $merge_tip and $excluded{$merge_tip};
- my $ranges = $ranges{$merge_tip};
-
# check out 'new' tips
my $merge_base;
eval {
@@ -3702,7 +3700,7 @@ sub find_extra_svn_parents {
my (@incomplete) = check_cherry_pick(
$merge_base, $merge_tip,
$parents,
- @$ranges,
+ @all_ranges,
);
if ( @incomplete ) {
diff --git a/t/t9163-git-svn-fetch-merge-branch-of-branch.sh
b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh
new file mode 100755
index 000..13ae7e3
--- /dev/null
+++ b/t/t9163-git-svn-fetch-merge-branch-of-branch.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Steven Walter
+#
+
+test_description='git svn merge detection'
+. ./lib-git-svn.sh
+
+svn_ver=$(svn --version --quiet)
+case $svn_ver in
+0.* | 1.[0-4].*)
+ skip_all=skipping git-svn test - SVN too old ($svn_ver)
+ test_done
+ ;;
+esac
+
+test_expect_success 'initialize source svn repo' '
+ svn_cmd mkdir -m x $svnrepo/trunk
+ svn_cmd mkdir -m x $svnrepo/branches
+ svn_cmd co $svnrepo/trunk $SVN_TREE
+ (
+ cd $SVN_TREE
+ touch foo
+ svn_cmd add foo
+ svn_cmd commit -m initial commit
+ svn_cmd cp -m branch $svnrepo/trunk
$svnrepo/branches/branch1
+ svn_cmd switch $svnrepo/branches/branch1
+ touch bar
+ svn_cmd add bar
+ svn_cmd commit -m branch1
+ svn_cmd cp -m branch $svnrepo/branches/branch1
$svnrepo/branches/branch2
+ svn_cmd switch $svnrepo/branches/branch2
+ touch baz
+ svn_cmd add baz
+ svn_cmd commit -m branch2
+ svn_cmd switch $svnrepo/trunk
+ touch bar2
+ svn_cmd add bar2
+ svn_cmd commit -m trunk
+ svn_cmd switch $svnrepo/branches/branch2
+ svn_cmd merge $svnrepo/trunk
+ svn_cmd commit -m merge trunk
+ svn_cmd switch $svnrepo/trunk
+ svn_cmd merge --reintegrate $svnrepo/branches/branch2
+ svn_cmd commit -m merge branch2
+ )
+ rm -rf $SVN_TREE
+'
+
+test_expect_success 'clone svn repo' '
+ git svn init -s $svnrepo
+ git svn fetch
+'
+
+test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2)
+ y=$(git rev-parse branch2)
+ test x$x = x$y
+'
+
+test_done
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
