@@ -183,7 +183,7 @@ int commit_graft_pos(struct repository *r, const struct object_id *oid)
183183 commit_graft_oid_access );
184184}
185185
186- static void unparse_commit (struct repository * r , const struct object_id * oid )
186+ void unparse_commit (struct repository * r , const struct object_id * oid )
187187{
188188 struct commit * c = lookup_commit (r , oid );
189189
@@ -324,18 +324,6 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
324324 return ret ;
325325}
326326
327- void reset_commit_grafts (struct repository * r )
328- {
329- int i ;
330-
331- for (i = 0 ; i < r -> parsed_objects -> grafts_nr ; i ++ ) {
332- unparse_commit (r , & r -> parsed_objects -> grafts [i ]-> oid );
333- free (r -> parsed_objects -> grafts [i ]);
334- }
335- r -> parsed_objects -> grafts_nr = 0 ;
336- r -> parsed_objects -> commit_graft_prepared = 0 ;
337- }
338-
339327struct commit_buffer {
340328 void * buffer ;
341329 unsigned long size ;
@@ -1156,11 +1144,14 @@ int add_header_signature(struct strbuf *buf, struct strbuf *sig, const struct gi
11561144
11571145static int sign_commit_to_strbuf (struct strbuf * sig , struct strbuf * buf , const char * keyid )
11581146{
1147+ char * keyid_to_free = NULL ;
1148+ int ret = 0 ;
11591149 if (!keyid || !* keyid )
1160- keyid = get_signing_key ();
1150+ keyid = keyid_to_free = get_signing_key ();
11611151 if (sign_buffer (buf , sig , keyid ))
1162- return -1 ;
1163- return 0 ;
1152+ ret = -1 ;
1153+ free (keyid_to_free );
1154+ return ret ;
11641155}
11651156
11661157int parse_signed_commit (const struct commit * commit ,
0 commit comments