Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ds/push-squelch-ambig-warning'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Nov 2018 07:24:40 +0000
(16:24 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Nov 2018 07:24:40 +0000
(16:24 +0900)
"git push" used to check ambiguities between object-names and
refnames while processing the list of refs' old and new values,
which was unnecessary (as it knew that it is feeding raw object
names). This has been optimized out.
* ds/push-squelch-ambig-warning:
pack-objects: ignore ambiguous object warnings
1
2
builtin/pack-objects.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
9549326
a4544b3
)
diff --cc
builtin/pack-objects.c
index 794714e4f8703c0efed76fc37006fba05496f660,f703e6df9bee56e46b453cc75be88cb7e6bb3e5f..d23e812861b8a639b9f46c3ebce5822f016d9a2e
---
1
/
builtin/pack-objects.c
---
2
/
builtin/pack-objects.c
+++ b/
builtin/pack-objects.c
@@@
-3084,10
-2988,10
+3084,11
@@@
static void get_object_list(int ac, con
struct rev_info revs;
char line[1000];
int flags = 0;
+ int save_warning;
-
init_revisions(
&revs, NULL);
+
repo_init_revisions(the_repository,
&revs, NULL);
save_commit_buffer = 0;
+ revs.allow_exclude_promisor_objects_opt = 1;
setup_revisions(ac, av, &revs, NULL);
/* make sure shallows are read */