[PATCH] safe_create_leading_directories: fix race that could give a false negative

f the directory now exists. Signed-off-by: Steven Walter --- 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

[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 director

[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 --- perl/Git/SVN.pm

[PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip

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 --- perl/Git/SVN.pm |8 ++- t/t9165-git-svn

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 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

[PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip

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 --- git-svn.perl|8 ++- t/t9163-git-svn-fetch-merge

[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 --- git-svn.perl

Re: [PATCH v2] git svn: reset invalidates the memoized mergeinfo caches

Signed-off-by: Steven Walter On Thu, Aug 9, 2012 at 2:42 AM, Peter Baumann wrote: > On Wed, Aug 08, 2012 at 10:52:58PM +, Eric Wong wrote: >> Peter Baumann wrote: >> > On Tue, Aug 07, 2012 at 08:45:10PM +, Eric Wong wrote: >>