From fa2656f1da2c01e139423d98b7cbc52cbeadb52c Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 10 Apr 2018 14:26:16 -0700 Subject: [PATCH 1/6] write_or_die.c: rename to use dashes in file name This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Makefile | 2 +- write_or_die.c => write-or-die.c | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename write_or_die.c => write-or-die.c (100%) diff --git a/Makefile b/Makefile index f181687250..f83b796831 100644 --- a/Makefile +++ b/Makefile @@ -936,7 +936,7 @@ LIB_OBJS += walker.o LIB_OBJS += wildmatch.o LIB_OBJS += worktree.o LIB_OBJS += wrapper.o -LIB_OBJS += write_or_die.o +LIB_OBJS += write-or-die.o LIB_OBJS += ws.o LIB_OBJS += wt-status.o LIB_OBJS += xdiff-interface.o diff --git a/write_or_die.c b/write-or-die.c similarity index 100% rename from write_or_die.c rename to write-or-die.c From e233bef43e4a73ec183eb927ab4803aefc77bab9 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 10 Apr 2018 14:26:17 -0700 Subject: [PATCH 2/6] unicode_width.h: rename to use dash in file name This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Also adjust contrib/update-unicode as well. Signed-off-by: Stefan Beller --- contrib/update-unicode/README | 6 +++--- contrib/update-unicode/update_unicode.sh | 2 +- unicode_width.h => unicode-width.h | 0 utf8.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename unicode_width.h => unicode-width.h (100%) diff --git a/contrib/update-unicode/README b/contrib/update-unicode/README index b9e2fc8540..151a197041 100644 --- a/contrib/update-unicode/README +++ b/contrib/update-unicode/README @@ -1,10 +1,10 @@ TL;DR: Run update_unicode.sh after the publication of a new Unicode -standard and commit the resulting unicode_widths.h file. +standard and commit the resulting unicode-widths.h file. The long version ================ -The Git source code ships the file unicode_widths.h which contains +The Git source code ships the file unicode-widths.h which contains tables of zero and double width Unicode code points, respectively. These tables are generated using update_unicode.sh in this directory. update_unicode.sh itself uses a third-party tool, uniset, to query two @@ -16,5 +16,5 @@ This requires a current-ish version of autoconf (2.69 works per December On each run, update_unicode.sh checks whether more recent Unicode data files are available from the Unicode consortium, and rebuilds the header -unicode_widths.h with the new data. The new header can then be +unicode-widths.h with the new data. The new header can then be committed. diff --git a/contrib/update-unicode/update_unicode.sh b/contrib/update-unicode/update_unicode.sh index e05db92d3f..aa90865bef 100755 --- a/contrib/update-unicode/update_unicode.sh +++ b/contrib/update-unicode/update_unicode.sh @@ -6,7 +6,7 @@ #Cf Format a format control character # cd "$(dirname "$0")" -UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode_width.h +UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode-width.h wget -N http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt \ http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt && diff --git a/unicode_width.h b/unicode-width.h similarity index 100% rename from unicode_width.h rename to unicode-width.h diff --git a/utf8.c b/utf8.c index 2c27ce0137..4419055b48 100644 --- a/utf8.c +++ b/utf8.c @@ -81,7 +81,7 @@ static int git_wcwidth(ucs_char_t ch) /* * Sorted list of non-overlapping intervals of non-spacing characters, */ -#include "unicode_width.h" +#include "unicode-width.h" /* test for 8-bit control characters */ if (ch == 0) From d807c4a01db2b06db047fc6d5d18ac25c8f05bd7 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 10 Apr 2018 14:26:18 -0700 Subject: [PATCH 3/6] exec_cmd: rename to use dash in file name This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Makefile | 6 +++--- attr.c | 2 +- builtin/add.c | 2 +- builtin/am.c | 2 +- builtin/describe.c | 2 +- builtin/difftool.c | 2 +- builtin/hash-object.c | 2 +- builtin/help.c | 2 +- builtin/index-pack.c | 2 +- builtin/init-db.c | 2 +- builtin/merge-tree.c | 2 +- builtin/notes.c | 2 +- builtin/pull.c | 2 +- builtin/receive-pack.c | 2 +- common-main.c | 2 +- config.c | 2 +- exec_cmd.c => exec-cmd.c | 2 +- exec_cmd.h => exec-cmd.h | 0 fetch-pack.c | 2 +- git.c | 2 +- help.c | 2 +- http-backend.c | 2 +- http-fetch.c | 2 +- http-push.c | 2 +- imap-send.c | 2 +- remote-curl.c | 2 +- remote-testsvn.c | 2 +- run-command.c | 2 +- sequencer.c | 2 +- shell.c | 2 +- upload-pack.c | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) rename exec_cmd.c => exec-cmd.c (99%) rename exec_cmd.h => exec-cmd.h (100%) diff --git a/Makefile b/Makefile index f83b796831..88730d6fdd 100644 --- a/Makefile +++ b/Makefile @@ -818,7 +818,7 @@ LIB_OBJS += ewah/bitmap.o LIB_OBJS += ewah/ewah_bitmap.o LIB_OBJS += ewah/ewah_io.o LIB_OBJS += ewah/ewah_rlw.o -LIB_OBJS += exec_cmd.o +LIB_OBJS += exec-cmd.o LIB_OBJS += fetch-object.o LIB_OBJS += fetch-pack.o LIB_OBJS += fsck.o @@ -2155,8 +2155,8 @@ else $(OBJECTS): $(LIB_H) endif -exec_cmd.sp exec_cmd.s exec_cmd.o: GIT-PREFIX -exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \ +exec-cmd.sp exec-cmd.s exec-cmd.o: GIT-PREFIX +exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \ '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \ '-DBINDIR="$(bindir_relative_SQ)"' \ '-DPREFIX="$(prefix_SQ)"' diff --git a/attr.c b/attr.c index dfc3a558d8..03a678fa9b 100644 --- a/attr.c +++ b/attr.c @@ -10,7 +10,7 @@ #define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" #include "config.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "attr.h" #include "dir.h" #include "utf8.h" diff --git a/builtin/add.c b/builtin/add.c index 9ef7fb02d5..c9e2619a9a 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -9,7 +9,7 @@ #include "lockfile.h" #include "dir.h" #include "pathspec.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "cache-tree.h" #include "run-command.h" #include "parse-options.h" diff --git a/builtin/am.c b/builtin/am.c index 9c82603f70..d834f9e62b 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -6,7 +6,7 @@ #include "cache.h" #include "config.h" #include "builtin.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "parse-options.h" #include "dir.h" #include "run-command.h" diff --git a/builtin/describe.c b/builtin/describe.c index de840f96a4..b5afc45846 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -6,7 +6,7 @@ #include "blob.h" #include "refs.h" #include "builtin.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "parse-options.h" #include "revision.h" #include "diff.h" diff --git a/builtin/difftool.c b/builtin/difftool.c index ee8dce019e..aad0e073ee 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -15,7 +15,7 @@ #include "config.h" #include "builtin.h" #include "run-command.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "parse-options.h" #include "argv-array.h" #include "strbuf.h" diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 526da5c185..a9a3a198c3 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -9,7 +9,7 @@ #include "blob.h" #include "quote.h" #include "parse-options.h" -#include "exec_cmd.h" +#include "exec-cmd.h" /* * This is to create corrupt objects for debugging and as such it diff --git a/builtin/help.c b/builtin/help.c index 598867cfea..2d51071429 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -4,7 +4,7 @@ #include "cache.h" #include "config.h" #include "builtin.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "parse-options.h" #include "run-command.h" #include "column.h" diff --git a/builtin/index-pack.c b/builtin/index-pack.c index d81473e722..7700907f1b 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -9,7 +9,7 @@ #include "tree.h" #include "progress.h" #include "fsck.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "streaming.h" #include "thread-utils.h" #include "packfile.h" diff --git a/builtin/init-db.c b/builtin/init-db.c index 68ff4ad75a..2542c5244e 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -7,7 +7,7 @@ #include "config.h" #include "refs.h" #include "builtin.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "parse-options.h" #ifndef DEFAULT_GIT_TEMPLATE_DIR diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 32736e0b10..bf01e05808 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -2,7 +2,7 @@ #include "tree-walk.h" #include "xdiff-interface.h" #include "blob.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "merge-blobs.h" static const char merge_tree_usage[] = "git merge-tree "; diff --git a/builtin/notes.c b/builtin/notes.c index 921e08d5bf..e5bf80eef1 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -14,7 +14,7 @@ #include "blob.h" #include "pretty.h" #include "refs.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "parse-options.h" #include "string-list.h" diff --git a/builtin/pull.c b/builtin/pull.c index e32d6cd5b4..71aac5005e 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -9,7 +9,7 @@ #include "config.h" #include "builtin.h" #include "parse-options.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "sha1-array.h" #include "remote.h" diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c4272fbc96..4b68a28e92 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -7,7 +7,7 @@ #include "pkt-line.h" #include "sideband.h" #include "run-command.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "commit.h" #include "object.h" #include "remote.h" diff --git a/common-main.c b/common-main.c index 7d716d5a54..b989e136b5 100644 --- a/common-main.c +++ b/common-main.c @@ -1,5 +1,5 @@ #include "cache.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "attr.h" /* diff --git a/config.c b/config.c index c698988f5e..e2b87b4764 100644 --- a/config.c +++ b/config.c @@ -9,7 +9,7 @@ #include "config.h" #include "repository.h" #include "lockfile.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "strbuf.h" #include "quote.h" #include "hashmap.h" diff --git a/exec_cmd.c b/exec-cmd.c similarity index 99% rename from exec_cmd.c rename to exec-cmd.c index ce192a2d64..8a8261746a 100644 --- a/exec_cmd.c +++ b/exec-cmd.c @@ -1,5 +1,5 @@ #include "cache.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "quote.h" #include "argv-array.h" #define MAX_ARGS 32 diff --git a/exec_cmd.h b/exec-cmd.h similarity index 100% rename from exec_cmd.h rename to exec-cmd.h diff --git a/fetch-pack.c b/fetch-pack.c index adc1b68dd3..4a8bad8487 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -6,7 +6,7 @@ #include "pkt-line.h" #include "commit.h" #include "tag.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "pack.h" #include "sideband.h" #include "fetch-pack.h" diff --git a/git.c b/git.c index 3a89893712..f598fae7b7 100644 --- a/git.c +++ b/git.c @@ -1,6 +1,6 @@ #include "builtin.h" #include "config.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "help.h" #include "run-command.h" diff --git a/help.c b/help.c index 60071a9bea..a4feef2ffe 100644 --- a/help.c +++ b/help.c @@ -1,7 +1,7 @@ #include "cache.h" #include "config.h" #include "builtin.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "levenshtein.h" #include "help.h" diff --git a/http-backend.c b/http-backend.c index 88d2a9bc40..cc16cd04ad 100644 --- a/http-backend.c +++ b/http-backend.c @@ -5,7 +5,7 @@ #include "pkt-line.h" #include "object.h" #include "tag.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "string-list.h" #include "url.h" diff --git a/http-fetch.c b/http-fetch.c index 8af380050c..885e471501 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -1,6 +1,6 @@ #include "cache.h" #include "config.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "http.h" #include "walker.h" diff --git a/http-push.c b/http-push.c index c0998fd763..f308ce0195 100644 --- a/http-push.c +++ b/http-push.c @@ -6,7 +6,7 @@ #include "refs.h" #include "diff.h" #include "revision.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "remote.h" #include "list-objects.h" #include "sigchain.h" diff --git a/imap-send.c b/imap-send.c index ffb0a6eca8..3573cbfb0f 100644 --- a/imap-send.c +++ b/imap-send.c @@ -24,7 +24,7 @@ #include "cache.h" #include "config.h" #include "credential.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "parse-options.h" #ifdef NO_OPENSSL diff --git a/remote-curl.c b/remote-curl.c index a7c4c9b5ff..8d2ffaf8de 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -4,7 +4,7 @@ #include "strbuf.h" #include "walker.h" #include "http.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "pkt-line.h" #include "string-list.h" diff --git a/remote-testsvn.c b/remote-testsvn.c index c4bb9a8ba9..444d98059f 100644 --- a/remote-testsvn.c +++ b/remote-testsvn.c @@ -3,7 +3,7 @@ #include "remote.h" #include "strbuf.h" #include "url.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "run-command.h" #include "vcs-svn/svndump.h" #include "notes.h" diff --git a/run-command.c b/run-command.c index 84899e423f..12c94c1dbe 100644 --- a/run-command.c +++ b/run-command.c @@ -1,6 +1,6 @@ #include "cache.h" #include "run-command.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "sigchain.h" #include "argv-array.h" #include "thread-utils.h" diff --git a/sequencer.c b/sequencer.c index 667f35ebdf..6d631d25c6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -7,7 +7,7 @@ #include "sequencer.h" #include "tag.h" #include "run-command.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "utf8.h" #include "cache-tree.h" #include "diff.h" diff --git a/shell.c b/shell.c index 234b2d4f16..0200d10796 100644 --- a/shell.c +++ b/shell.c @@ -1,6 +1,6 @@ #include "cache.h" #include "quote.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "strbuf.h" #include "run-command.h" diff --git a/upload-pack.c b/upload-pack.c index 4a82602be5..6261d4fab3 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -6,7 +6,7 @@ #include "tag.h" #include "object.h" #include "commit.h" -#include "exec_cmd.h" +#include "exec-cmd.h" #include "diff.h" #include "revision.h" #include "list-objects.h" From e5e5e08832f7c4d581c0c70542e61235d21a8067 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 10 Apr 2018 14:26:19 -0700 Subject: [PATCH 4/6] sha1_name.c: rename to use dash in file name This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Makefile | 2 +- list-objects-filter.c | 2 +- object.h | 2 +- sha1_name.c => sha1-name.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename sha1_name.c => sha1-name.c (100%) diff --git a/Makefile b/Makefile index 88730d6fdd..ed0ac30a16 100644 --- a/Makefile +++ b/Makefile @@ -901,7 +901,7 @@ LIB_OBJS += setup.o LIB_OBJS += sha1-array.o LIB_OBJS += sha1-lookup.o LIB_OBJS += sha1_file.o -LIB_OBJS += sha1_name.o +LIB_OBJS += sha1-name.o LIB_OBJS += shallow.o LIB_OBJS += sideband.o LIB_OBJS += sigchain.o diff --git a/list-objects-filter.c b/list-objects-filter.c index 0ec83aaf18..247717561f 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -19,7 +19,7 @@ * in the traversal (until we mark it SEEN). This is a way to * let us silently de-dup calls to show() in the caller. This * is subtly different from the "revision.h:SHOWN" and the - * "sha1_name.c:ONELINE_SEEN" bits. And also different from + * "sha1-name.c:ONELINE_SEEN" bits. And also different from * the non-de-dup usage in pack-bitmap.c */ #define FILTER_SHOWN_BUT_REVISIT (1<<21) diff --git a/object.h b/object.h index f13f85b2a9..b8e70e5519 100644 --- a/object.h +++ b/object.h @@ -37,7 +37,7 @@ struct object_array { * bundle.c: 16 * http-push.c: 16-----19 * commit.c: 16-----19 - * sha1_name.c: 20 + * sha1-name.c: 20 * list-objects-filter.c: 21 * builtin/fsck.c: 0--3 * builtin/index-pack.c: 2021 diff --git a/sha1_name.c b/sha1-name.c similarity index 100% rename from sha1_name.c rename to sha1-name.c From fc1395f4a491a7da46a446233531005634eb979d Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 10 Apr 2018 14:26:20 -0700 Subject: [PATCH 5/6] sha1_file.c: rename to use dash in file name This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Signed-off-by: Stefan Beller --- Documentation/technical/api-object-access.txt | 2 +- Makefile | 2 +- builtin/index-pack.c | 2 +- sha1_file.c => sha1-file.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename sha1_file.c => sha1-file.c (100%) diff --git a/Documentation/technical/api-object-access.txt b/Documentation/technical/api-object-access.txt index a1162e5bcd..5b29622d00 100644 --- a/Documentation/technical/api-object-access.txt +++ b/Documentation/technical/api-object-access.txt @@ -1,7 +1,7 @@ object access API ================= -Talk about and family, things like +Talk about and family, things like * read_sha1_file() * read_object_with_reference() diff --git a/Makefile b/Makefile index ed0ac30a16..ce26efa7dc 100644 --- a/Makefile +++ b/Makefile @@ -900,7 +900,7 @@ LIB_OBJS += server-info.o LIB_OBJS += setup.o LIB_OBJS += sha1-array.o LIB_OBJS += sha1-lookup.o -LIB_OBJS += sha1_file.o +LIB_OBJS += sha1-file.o LIB_OBJS += sha1-name.o LIB_OBJS += shallow.o LIB_OBJS += sideband.o diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 7700907f1b..78e66b9986 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1593,7 +1593,7 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) /* * Get rid of the idx file as we do not need it anymore. * NEEDSWORK: extract this bit from free_pack_by_name() in - * sha1_file.c, perhaps? It shouldn't matter very much as we + * sha1-file.c, perhaps? It shouldn't matter very much as we * know we haven't installed this pack (hence we never have * read anything from it). */ diff --git a/sha1_file.c b/sha1-file.c similarity index 100% rename from sha1_file.c rename to sha1-file.c From 11bc058ce66a437499a774e82398c96e1324e2e0 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 10 Apr 2018 14:26:21 -0700 Subject: [PATCH 6/6] replace_object.c: rename to use dash in file name This is more consistent with the project style. The majority of Git's source files use dashes in preference to underscores in their file names. Noticed while adding a header corresponding to this file. Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller --- Makefile | 2 +- replace_object.c => replace-object.c | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename replace_object.c => replace-object.c (100%) diff --git a/Makefile b/Makefile index ce26efa7dc..7262b7c942 100644 --- a/Makefile +++ b/Makefile @@ -888,7 +888,7 @@ LIB_OBJS += refs/packed-backend.o LIB_OBJS += refs/ref-cache.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o -LIB_OBJS += replace_object.o +LIB_OBJS += replace-object.o LIB_OBJS += repository.o LIB_OBJS += rerere.o LIB_OBJS += resolve-undo.o diff --git a/replace_object.c b/replace-object.c similarity index 100% rename from replace_object.c rename to replace-object.c