subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r958198 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Date Sat, 26 Jun 2010 07:58:06 GMT
Author: julianfoad
Date: Sat Jun 26 07:58:06 2010
New Revision: 958198

URL: http://svn.apache.org/viewvc?rev=958198&view=rev
Log:
* subversion/libsvn_wc/workqueue.c
  (svn_wc__wq_build_pristine_get_translated): Don't allow SHA-1 to be
    NULL (it was meaningless and not supported).  Fix pool usage.
    A follow-up to r957921

Modified:
    subversion/trunk/subversion/libsvn_wc/workqueue.c

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=958198&r1=958197&r2=958198&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Sat Jun 26 07:58:06 2010
@@ -2431,11 +2431,9 @@ svn_wc__wq_build_pristine_get_translated
 {
   *work_item = svn_skel__make_empty_list(result_pool);
 
-  svn_skel__prepend_str(pristine_sha1
-                          ? svn_checksum_serialize(pristine_sha1,
-                                                   scratch_pool, scratch_pool)
-                          : "",
-                        *work_item, scratch_pool);
+  svn_skel__prepend_str(svn_checksum_serialize(pristine_sha1,
+                                               result_pool, scratch_pool),
+                        *work_item, result_pool);
   svn_skel__prepend_str(apr_pstrdup(result_pool, new_abspath),
                         *work_item, result_pool);
   svn_skel__prepend_str(apr_pstrdup(result_pool, versioned_abspath),



Mime
View raw message