From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:54 +0000 (+0900)
Subject: Merge branch 'tb/void-check-attr' into maint
X-Git-Tag: v2.19.2~34
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/761868b693e2c034148c32bb7fba182a0b381d44?ds=inline;hp=-c

Merge branch 'tb/void-check-attr' into maint

Code clean-up.

* tb/void-check-attr:
Make git_check_attr() a void function
---

761868b693e2c034148c32bb7fba182a0b381d44
diff --combined builtin/pack-objects.c
index ad3c650c08,eb71dab5be..2eba0a695b
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -951,8 -951,7 +951,7 @@@ static int no_try_delta(const char *pat
  
  	if (!check)
  		check = attr_check_initl("delta", NULL);
- 	if (git_check_attr(&the_index, path, check))
- 		return 0;
+ 	git_check_attr(&the_index, path, check);
  	if (ATTR_FALSE(check->items[0].value))
  		return 1;
  	return 0;
@@@ -2299,6 -2298,7 +2298,6 @@@ static void init_threaded_search(void
  	pthread_mutex_init(&cache_mutex, NULL);
  	pthread_mutex_init(&progress_mutex, NULL);
  	pthread_cond_init(&progress_cond, NULL);
 -	pthread_mutex_init(&to_pack.lock, NULL);
  	old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
  }
  
@@@ -2990,7 -2990,6 +2989,7 @@@ static void get_object_list(int ac, con
  
  	init_revisions(&revs, NULL);
  	save_commit_buffer = 0;
 +	revs.allow_exclude_promisor_objects_opt = 1;
  	setup_revisions(ac, av, &revs, NULL);
  
  	/* make sure shallows are read */