svn commit: r1553556 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Dec 26 19:20:15 2013
New Revision: 1553556

URL: http://svn.apache.org/r1553556
Log:
Fix path filter for the 'If' header processing in libsvn_ra_serf.

* subversion/libsvn_ra_serf/commit.c
  (setup_if_header_recursive): Following up on r1553552, fix bad example of
    argument<->variable shadowing introduced by a refactoring before
    committing.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/commit.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1553556&r1=1553555&r2=1553556&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Thu Dec 26 19:20:15 2013
@@ -1083,7 +1083,7 @@ static svn_error_t *
 setup_if_header_recursive(svn_boolean_t *added,
                           serf_bucket_t *headers,
                           commit_context_t *commit_ctx,
-                          const char *relpath,
+                          const char *rq_relpath,
                           apr_pool_t *pool)
 {
   svn_stringbuf_t *sb = NULL;
@@ -1108,7 +1108,7 @@ setup_if_header_recursive(svn_boolean_t 
       const char *relpath = svn__apr_hash_index_key(hi);
       apr_uri_t uri;
 
-      if (!svn_relpath_skip_ancestor(relpath, relpath))
+      if (!svn_relpath_skip_ancestor(rq_relpath, relpath))
         continue;
       else if (svn_hash_gets(commit_ctx->deleted_entries, relpath))
         {