Author: stsp
Date: Fri Sep 5 14:42:56 2014
New Revision: 1622711
URL: http://svn.apache.org/r1622711
Log:
On the log-message-templates branch, reinstate a check that prevents
us from setting a log message template more than once. This check was
accidentally removed in r1622710.
* subversion/libsvn_client/commit_util.c
(svn_client_get_log_message_templates): If we already have a log messsage
template from the defining_repos_relpath in question, don't allocate and
set the template again.
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=1622711&r1=1622710&r2=1622711&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
Fri Sep 5 14:42:56 2014
@@ -567,8 +567,9 @@ svn_client_get_log_message_templates(apr
/* Embedded NUL characters in the log message template string
* terminate the template regardless of the actual value of
* propval->len. */
- svn_hash_sets(*log_message_templates, defining_repos_relpath,
- apr_pstrdup(result_pool, propval->data));
+ if (!svn_hash_gets(*log_message_templates, defining_repos_relpath))
+ svn_hash_sets(*log_message_templates, defining_repos_relpath,
+ apr_pstrdup(result_pool, propval->data));
}
svn_pool_destroy(iterpool);
