@@ -146,79 +146,19 @@ static int do_rev_list(int fd, void *create_full_pack)
146
146
return 0 ;
147
147
}
148
148
149
- static int feed_msg_to_hook (int fd , const char * fmt , ...)
150
- {
151
- int cnt ;
152
- char buf [1024 ];
153
- va_list params ;
154
-
155
- va_start (params , fmt );
156
- cnt = vsprintf (buf , fmt , params );
157
- va_end (params );
158
- return write_in_full (fd , buf , cnt ) != cnt ;
159
- }
160
-
161
- static int feed_obj_to_hook (const char * label , struct object_array * oa , int i , int fd )
162
- {
163
- return feed_msg_to_hook (fd , "%s %s\n" , label ,
164
- sha1_to_hex (oa -> objects [i ].item -> sha1 ));
165
- }
166
-
167
- static int run_post_upload_pack_hook (size_t total , struct timeval * tv )
168
- {
169
- const char * argv [2 ];
170
- struct child_process proc ;
171
- int err , i ;
172
-
173
- argv [0 ] = "hooks/post-upload-pack" ;
174
- argv [1 ] = NULL ;
175
-
176
- if (access (argv [0 ], X_OK ) < 0 )
177
- return 0 ;
178
-
179
- memset (& proc , 0 , sizeof (proc ));
180
- proc .argv = argv ;
181
- proc .in = -1 ;
182
- proc .stdout_to_stderr = 1 ;
183
- err = start_command (& proc );
184
- if (err )
185
- return err ;
186
- for (i = 0 ; !err && i < want_obj .nr ; i ++ )
187
- err |= feed_obj_to_hook ("want" , & want_obj , i , proc .in );
188
- for (i = 0 ; !err && i < have_obj .nr ; i ++ )
189
- err |= feed_obj_to_hook ("have" , & have_obj , i , proc .in );
190
- if (!err )
191
- err |= feed_msg_to_hook (proc .in , "time %ld.%06ld\n" ,
192
- (long )tv -> tv_sec , (long )tv -> tv_usec );
193
- if (!err )
194
- err |= feed_msg_to_hook (proc .in , "size %ld\n" , (long )total );
195
- if (!err )
196
- err |= feed_msg_to_hook (proc .in , "kind %s\n" ,
197
- (nr_our_refs == want_obj .nr && !have_obj .nr )
198
- ? "clone" : "fetch" );
199
- if (close (proc .in ))
200
- err = 1 ;
201
- if (finish_command (& proc ))
202
- err = 1 ;
203
- return err ;
204
- }
205
-
206
149
static void create_pack_file (void )
207
150
{
208
- struct timeval start_tv , tv ;
209
151
struct async rev_list ;
210
152
struct child_process pack_objects ;
211
153
int create_full_pack = (nr_our_refs == want_obj .nr && !have_obj .nr );
212
154
char data [8193 ], progress [128 ];
213
155
char abort_msg [] = "aborting due to possible repository "
214
156
"corruption on the remote side." ;
215
157
int buffered = -1 ;
216
- ssize_t sz , total_sz ;
158
+ ssize_t sz ;
217
159
const char * argv [10 ];
218
160
int arg = 0 ;
219
161
220
- gettimeofday (& start_tv , NULL );
221
- total_sz = 0 ;
222
162
if (shallow_nr ) {
223
163
rev_list .proc = do_rev_list ;
224
164
rev_list .data = 0 ;
@@ -344,7 +284,7 @@ static void create_pack_file(void)
344
284
sz = xread (pack_objects .out , cp ,
345
285
sizeof (data ) - outsz );
346
286
if (0 < sz )
347
- total_sz += sz ;
287
+ ;
348
288
else if (sz == 0 ) {
349
289
close (pack_objects .out );
350
290
pack_objects .out = -1 ;
@@ -381,16 +321,6 @@ static void create_pack_file(void)
381
321
}
382
322
if (use_sideband )
383
323
packet_flush (1 );
384
-
385
- gettimeofday (& tv , NULL );
386
- tv .tv_sec -= start_tv .tv_sec ;
387
- if (tv .tv_usec < start_tv .tv_usec ) {
388
- tv .tv_sec -- ;
389
- tv .tv_usec += 1000000 ;
390
- }
391
- tv .tv_usec -= start_tv .tv_usec ;
392
- if (run_post_upload_pack_hook (total_sz , & tv ))
393
- warning ("post-upload-hook failed" );
394
324
return ;
395
325
396
326
fail :
0 commit comments