sha1_name: warning ambiguous refs.
This makes sure that many commands that take refs on the command line to honor core.warnambiguousrefs configuration. Earlier, the commands affected by this patch did not read the configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 23, 2006 at 23:41 UTC
84a9b58c421f9b2d1cc6c195ed441fac48e60392
12 files changed
+15
-3
blame.c
+1
@@ -752,6 +752,7 @@ int main(int argc, const char **argv)
752
int found_rename;
753
754
const char* prefix = setup_git_directory();
755
+ git_config(git_default_config);
756
757
for(i = 1; i < argc; i++) {
758
if(options) {
cat-file.c
+1
@@ -100,6 +100,7 @@ int main(int argc, char **argv)
100
int opt;
101
102
setup_git_directory();
103
+ git_config(git_default_config);
104
if (argc != 3 || get_sha1(argv[2], sha1))
105
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
106
ls-tree.c
+1
@@ -87,6 +87,7 @@ int main(int argc, const char **argv)
87
struct tree *tree;
88
89
prefix = setup_git_directory();
90
+ git_config(git_default_config);
91
if (prefix && *prefix)
92
chomp_prefix = strlen(prefix);
93
while (1 < argc && argv[1][0] == '-') {
merge-base.c
+1
@@ -237,6 +237,7 @@ int main(int argc, char **argv)
237
unsigned char rev1key[20], rev2key[20];
238
239
setup_git_directory();
240
+ git_config(git_default_config);
241
242
while (1 < argc && argv[1][0] == '-') {
243
char *arg = argv[1];
name-rev.c
+1
@@ -127,6 +127,7 @@ int main(int argc, char **argv)
127
int as_is = 0, all = 0, transform_stdin = 0;
128
129
setup_git_directory();
130
+ git_config(git_default_config);
131
132
if (argc < 2)
133
usage(name_rev_usage);
read-tree.c
+1
@@ -717,6 +717,7 @@ int main(int argc, char **argv)
717
merge_fn_t fn = NULL;
718
719
setup_git_directory();
720
+ git_config(git_default_config);
721
722
newfd = hold_index_file_for_update(&cache_file, get_index_file());
723
if (newfd < 0)
rev-parse.c
+2
@@ -166,6 +166,8 @@ int main(int argc, char **argv)
166
unsigned char sha1[20];
167
const char *prefix = setup_git_directory();
168
169
+ git_config(git_default_config);
170
+
171
for (i = 1; i < argc; i++) {
172
struct stat st;
173
char *arg = argv[i];
send-pack.c
+2
@@ -362,6 +362,8 @@ int main(int argc, char **argv)
362
pid_t pid;
363
364
setup_git_directory();
365
+ git_config(git_default_config);
366
+
367
argv++;
368
for (i = 1; i < argc; i++, argv++) {
369
char *arg = *argv;
sha1_name.c
+2
-3
@@ -236,7 +236,7 @@ static int ambiguous_path(const char *path, int len)
236
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
237
{
238
static const char *fmt[] = {
239
- "/%.*s",
239
+ "%.*s",
240
"refs/%.*s",
241
"refs/tags/%.*s",
242
"refs/heads/%.*s",
@@ -263,8 +263,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
263
pathname = git_path(*p, len, str);
264
if (!read_ref(pathname, this_result)) {
265
if (warn_ambiguous_refs) {
266
- if (already_found &&
267
- !memcmp(sha1, sha1_from_ref, 20))
266
+ if (already_found)
267
fprintf(stderr, warning, len, str);
268
already_found++;
269
}
tar-tree.c
+1
@@ -380,6 +380,7 @@ int main(int argc, char **argv)
380
struct tree_desc tree;
381
382
setup_git_directory();
383
+ git_config(git_default_config);
384
385
switch (argc) {
386
case 3:
unpack-file.c
+1
@@ -30,6 +30,7 @@ int main(int argc, char **argv)
30
usage("git-unpack-file <sha1>");
31
32
setup_git_directory();
33
+ git_config(git_default_config);
34
35
puts(create_temp_file(sha1));
36
return 0;
update-ref.c
+1
@@ -25,6 +25,7 @@ int main(int argc, char **argv)
25
int fd, written;
26
27
setup_git_directory();
28
+ git_config(git_default_config);
29
if (argc < 3 || argc > 4)
30
usage(git_update_ref_usage);
31