Skip to content

Commit 8dbae25

Browse files
dschodscho
committed
Merge 'misc-vs-fixes' into HEAD
2 parents 2de14bd + 838e406 commit 8dbae25

File tree

15 files changed

+49
-17
lines changed

15 files changed

+49
-17
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* whitespace=!indent,trail,space
2-
*.[ch] whitespace=indent,trail,space diff=cpp
3-
*.sh whitespace=indent,trail,space
2+
*.[ch] whitespace=indent,trail,space diff=cpp eol=lf
3+
*.sh whitespace=indent,trail,space eol=lf
4+
*.{perl,pm,txt} eol=lf

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,7 +2015,7 @@ exec_cmd.sp exec_cmd.s exec_cmd.o: GIT-PREFIX
20152015
exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
20162016
'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
20172017
'-DBINDIR="$(bindir_relative_SQ)"' \
2018-
'-DPREFIX="$(prefix_SQ)"'
2018+
'-DFALLBACK_RUNTIME_PREFIX="$(prefix_SQ)"'
20192019

20202020
builtin/init-db.sp builtin/init-db.s builtin/init-db.o: GIT-PREFIX
20212021
builtin/init-db.sp builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \
@@ -2280,7 +2280,7 @@ bin-wrappers/%: wrap-for-bin.sh
22802280
@mkdir -p bin-wrappers
22812281
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
22822282
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
2283-
-e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
2283+
-e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%$(X),$(@F))$(patsubst git%,$(X),$(filter $(@F),$(BINDIR_PROGRAMS_NEED_X)))|' < $< > $@ && \
22842284
chmod +x $@
22852285

22862286
# GNU make supports exporting all variables by "export" without parameters.

‎builtin/rev-list.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
388388
mark_edges_uninteresting(&revs, show_edge);
389389

390390
if (bisect_list) {
391-
int reaches = reaches, all = all;
391+
FAKE_INIT(int, reaches, 0);
392+
FAKE_INIT(int, all, 0);
392393

393394
revs.commits = find_bisection(revs.commits, &reaches, &all,
394395
bisect_find_all);

‎compat/obstack.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ __extension__ \
493493
( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \
494494
((((h)->temp.tempint > 0 \
495495
&& (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \
496-
? (int) ((h)->next_free = (h)->object_base \
496+
? (ptrdiff_t) ((h)->next_free = (h)->object_base \
497497
= (h)->temp.tempint + (char *) (h)->chunk) \
498498
: (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
499499

‎compat/terminal.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#ifndef NO_INTTYPES_H
12
#include <inttypes.h>
3+
#endif
24
#include "git-compat-util.h"
35
#include "run-command.h"
46
#include "compat/terminal.h"

‎config.mak.uname‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,9 @@ ifeq ($(uname_S),Windows)
400400
compat/win32/dirent.o compat/win32/fscache.o
401401
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
402402
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
403+
# invalidcontinue.obj allows Git's source code to close the same file
404+
# handle twice, or to access the osfhandle of an already-closed stdout
405+
# See https://msdn.microsoft.com/en-us/library/ms235330.aspx
403406
EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib
404407
PTHREAD_LIBS =
405408
lib =

‎exec_cmd.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ char *system_path(const char *path)
1212
#ifdef RUNTIME_PREFIX
1313
static const char *prefix;
1414
#else
15-
static const char *prefix = PREFIX;
15+
static const char *prefix = FALLBACK_RUNTIME_PREFIX;
1616
#endif
1717
struct strbuf d = STRBUF_INIT;
1818

@@ -27,7 +27,7 @@ char *system_path(const char *path)
2727
!(prefix = strip_path_suffix(argv0_path, GIT_EXEC_PATH)) &&
2828
!(prefix = strip_path_suffix(argv0_path, BINDIR)) &&
2929
!(prefix = strip_path_suffix(argv0_path, "git"))) {
30-
prefix = PREFIX;
30+
prefix = FALLBACK_RUNTIME_PREFIX;
3131
trace_printf("RUNTIME_PREFIX requested, "
3232
"but prefix computation failed. "
3333
"Using static fallback '%s'.\n", prefix);

‎fast-import.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2992,7 +2992,7 @@ static void cat_blob(struct object_entry *oe, unsigned char sha1[20])
29922992

29932993
static void parse_get_mark(const char *p)
29942994
{
2995-
struct object_entry *oe = oe;
2995+
FAKE_INIT(struct object_entry *, oe, NULL);
29962996
char output[42];
29972997

29982998
/* get-mark SP <object> LF */
@@ -3009,7 +3009,7 @@ static void parse_get_mark(const char *p)
30093009

30103010
static void parse_cat_blob(const char *p)
30113011
{
3012-
struct object_entry *oe = oe;
3012+
FAKE_INIT(struct object_entry *, oe, NULL);
30133013
unsigned char sha1[20];
30143014

30153015
/* cat-blob SP <object> LF */

‎git-compat-util.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,23 @@
5151
#endif
5252
#endif
5353

54+
/*
55+
* Under certain circumstances Git's source code is cleverer than the C
56+
* compiler when the latter warns about some "uninitialized value", e.g. when
57+
* a value is both initialized and used under the same condition.
58+
*
59+
* GCC can be fooled to not spit out this warning by using the construct:
60+
* "int value = value;". Other C compilers are not that easily fooled and would
61+
* require a #pragma (which is not portable, and would litter the source code).
62+
*
63+
* To keep things simple, we only fool GCC, and initialize such values instead
64+
* when compiling with other C compilers.
65+
*/
66+
#ifdef __GNUC__
67+
#define FAKE_INIT(a, b, c) a b = b
68+
#else
69+
#define FAKE_INIT(a, b, c) a b = c
70+
#endif
5471

5572
/*
5673
* BUILD_ASSERT_OR_ZERO - assert a build-time dependency, as an expression.

‎merge-recursive.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,7 @@ int merge_recursive(struct merge_options *o,
20082008
{
20092009
struct commit_list *iter;
20102010
struct commit *merged_common_ancestors;
2011-
struct tree *mrtree = mrtree;
2011+
FAKE_INIT(struct tree *, mrtree, NULL);
20122012
int clean;
20132013

20142014
if (show(o, 4)) {

0 commit comments

Comments
 (0)