Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AA56A115EE for ; Wed, 10 Sep 2014 16:01:38 +0000 (UTC) Received: (qmail 18723 invoked by uid 500); 10 Sep 2014 16:01:37 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 18703 invoked by uid 500); 10 Sep 2014 16:01:37 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 18662 invoked by uid 99); 10 Sep 2014 16:01:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Sep 2014 16:01:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Sep 2014 16:01:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6637B23888E2; Wed, 10 Sep 2014 16:01:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1624047 - /subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c Date: Wed, 10 Sep 2014 16:01:14 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140910160114.6637B23888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Wed Sep 10 16:01:13 2014 New Revision: 1624047 URL: http://svn.apache.org/r1624047 Log: On the log-message-templates branch: * subversion/libsvn_client/commit_util.c (svn_client_get_log_message_templates_for_commit_items): Don't allocate and add a template for a given defining_repos_relpath multiple times. Modified: subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c Modified: subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c URL: http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c?rev=1624047&r1=1624046&r2=1624047&view=diff ============================================================================== --- subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c (original) +++ subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c Wed Sep 10 16:01:13 2014 @@ -2125,7 +2125,9 @@ svn_client_get_log_message_templates_for path_or_url, &peg_revision, &revision, NULL, ctx, iterpool, iterpool)); - if (log_message_template) + if (log_message_template && + svn_hash_gets(*log_message_templates, + defining_repos_relpath) == NULL) svn_hash_sets(*log_message_templates, apr_pstrdup(result_pool, defining_repos_relpath), apr_pstrdup(result_pool, log_message_template));