@@ -291,7 +291,7 @@ static void parse_pack_header(void)
291291 if (hdr -> hdr_signature != htonl (PACK_SIGNATURE ))
292292 die (_ ("pack signature mismatch" ));
293293 if (!pack_version_ok (hdr -> hdr_version ))
294- die ("pack version %" PRIu32 " unsupported" ,
294+ die (_ ( "pack version %" PRIu32 " unsupported" ) ,
295295 ntohl (hdr -> hdr_version ));
296296
297297 nr_objects = ntohl (hdr -> hdr_entries );
@@ -1061,7 +1061,8 @@ static void resolve_deltas(void)
10611061 int ret = pthread_create (& thread_data [i ].thread , NULL ,
10621062 threaded_second_pass , thread_data + i );
10631063 if (ret )
1064- die ("unable to create thread: %s" , strerror (ret ));
1064+ die (_ ("unable to create thread: %s" ),
1065+ strerror (ret ));
10651066 }
10661067 for (i = 0 ; i < nr_threads ; i ++ )
10671068 pthread_join (thread_data [i ].thread , NULL );
@@ -1108,7 +1109,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
11081109 * sizeof (* objects ));
11091110 f = sha1fd (output_fd , curr_pack );
11101111 fix_unresolved_deltas (f , nr_unresolved );
1111- sprintf (msg , "completed with %d local objects" ,
1112+ sprintf (msg , _ ( "completed with %d local objects" ) ,
11121113 nr_objects - nr_objects_initial );
11131114 stop_progress_msg (& progress , msg );
11141115 sha1close (f , tail_sha1 , 0 );
@@ -1117,8 +1118,8 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
11171118 curr_pack , nr_objects ,
11181119 read_sha1 , consumed_bytes - 20 );
11191120 if (hashcmp (read_sha1 , tail_sha1 ) != 0 )
1120- die ("Unexpected tail checksum for %s "
1121- "(disk corruption?)" , curr_pack );
1121+ die (_ ( "Unexpected tail checksum for %s "
1122+ "(disk corruption?)" ) , curr_pack );
11221123 }
11231124 if (nr_deltas != nr_resolved_deltas )
11241125 die (Q_ ("pack has %d unresolved delta" ,
@@ -1327,17 +1328,17 @@ static int git_index_pack_config(const char *k, const char *v, void *cb)
13271328 if (!strcmp (k , "pack.indexversion" )) {
13281329 opts -> version = git_config_int (k , v );
13291330 if (opts -> version > 2 )
1330- die ("bad pack.indexversion=%" PRIu32 , opts -> version );
1331+ die (_ ( "bad pack.indexversion=%" PRIu32 ) , opts -> version );
13311332 return 0 ;
13321333 }
13331334 if (!strcmp (k , "pack.threads" )) {
13341335 nr_threads = git_config_int (k , v );
13351336 if (nr_threads < 0 )
1336- die ("invalid number of threads specified (%d)" ,
1337+ die (_ ( "invalid number of threads specified (%d)" ) ,
13371338 nr_threads );
13381339#ifdef NO_PTHREADS
13391340 if (nr_threads != 1 )
1340- warning ("no threads support, ignoring %s" , k );
1341+ warning (_ ( "no threads support, ignoring %s" ) , k );
13411342 nr_threads = 1 ;
13421343#endif
13431344 return 0 ;
@@ -1510,8 +1511,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
15101511 usage (index_pack_usage );
15111512#ifdef NO_PTHREADS
15121513 if (nr_threads != 1 )
1513- warning ("no threads support, "
1514- "ignoring %s" , arg );
1514+ warning (_ ( "no threads support, "
1515+ "ignoring %s" ) , arg );
15151516 nr_threads = 1 ;
15161517#endif
15171518 } else if (!prefixcmp (arg , "--pack_header=" )) {
0 commit comments