Browse Source

Merge branch 'sb/filenames-with-dashes'

Rename bunch of source files to more consistently use dashes
instead of underscores to connect words.

* sb/filenames-with-dashes:
  replace_object.c: rename to use dash in file name
  sha1_file.c: rename to use dash in file name
  sha1_name.c: rename to use dash in file name
  exec_cmd: rename to use dash in file name
  unicode_width.h: rename to use dash in file name
  write_or_die.c: rename to use dashes in file name
maint
Junio C Hamano 7 years ago
parent
commit
89e5aa3dff
  1. 2
      Documentation/technical/api-object-access.txt
  2. 14
      Makefile
  3. 2
      attr.c
  4. 2
      builtin/add.c
  5. 2
      builtin/am.c
  6. 2
      builtin/describe.c
  7. 2
      builtin/difftool.c
  8. 2
      builtin/hash-object.c
  9. 2
      builtin/help.c
  10. 4
      builtin/index-pack.c
  11. 2
      builtin/init-db.c
  12. 2
      builtin/merge-tree.c
  13. 2
      builtin/notes.c
  14. 2
      builtin/pull.c
  15. 2
      builtin/receive-pack.c
  16. 2
      common-main.c
  17. 2
      config.c
  18. 6
      contrib/update-unicode/README
  19. 2
      contrib/update-unicode/update_unicode.sh
  20. 2
      exec-cmd.c
  21. 0
      exec-cmd.h
  22. 2
      fetch-pack.c
  23. 2
      git.c
  24. 2
      help.c
  25. 2
      http-backend.c
  26. 2
      http-fetch.c
  27. 2
      http-push.c
  28. 2
      imap-send.c
  29. 2
      list-objects-filter.c
  30. 2
      object.h
  31. 2
      remote-curl.c
  32. 2
      remote-testsvn.c
  33. 0
      replace-object.c
  34. 2
      run-command.c
  35. 2
      sequencer.c
  36. 0
      sha1-file.c
  37. 0
      sha1-name.c
  38. 2
      shell.c
  39. 0
      unicode-width.h
  40. 2
      upload-pack.c
  41. 2
      utf8.c
  42. 0
      write-or-die.c

2
Documentation/technical/api-object-access.txt

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
object access API
=================

Talk about <sha1_file.c> and <object.h> family, things like
Talk about <sha1-file.c> and <object.h> family, things like

* read_sha1_file()
* read_object_with_reference()

14
Makefile

@ -819,7 +819,7 @@ LIB_OBJS += ewah/bitmap.o @@ -819,7 +819,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
@ -889,7 +889,7 @@ LIB_OBJS += refs/packed-backend.o @@ -889,7 +889,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
@ -901,8 +901,8 @@ LIB_OBJS += server-info.o @@ -901,8 +901,8 @@ 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_name.o
LIB_OBJS += sha1-file.o
LIB_OBJS += sha1-name.o
LIB_OBJS += shallow.o
LIB_OBJS += sideband.o
LIB_OBJS += sigchain.o
@ -937,7 +937,7 @@ LIB_OBJS += walker.o @@ -937,7 +937,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
@ -2156,8 +2156,8 @@ else @@ -2156,8 +2156,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)"'

2
attr.c

@ -10,7 +10,7 @@ @@ -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"

2
builtin/add.c

@ -9,7 +9,7 @@ @@ -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"

2
builtin/am.c

@ -6,7 +6,7 @@ @@ -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"

2
builtin/describe.c

@ -6,7 +6,7 @@ @@ -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"

2
builtin/difftool.c

@ -15,7 +15,7 @@ @@ -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"

2
builtin/hash-object.c

@ -9,7 +9,7 @@ @@ -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

2
builtin/help.c

@ -4,7 +4,7 @@ @@ -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"

4
builtin/index-pack.c

@ -9,7 +9,7 @@ @@ -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"
@ -1593,7 +1593,7 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) @@ -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).
*/

2
builtin/init-db.c

@ -7,7 +7,7 @@ @@ -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

2
builtin/merge-tree.c

@ -2,7 +2,7 @@ @@ -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 <base-tree> <branch1> <branch2>";

2
builtin/notes.c

@ -14,7 +14,7 @@ @@ -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"

2
builtin/pull.c

@ -9,7 +9,7 @@ @@ -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"

2
builtin/receive-pack.c

@ -7,7 +7,7 @@ @@ -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"

2
common-main.c

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
#include "cache.h"
#include "exec_cmd.h"
#include "exec-cmd.h"
#include "attr.h"

/*

2
config.c

@ -9,7 +9,7 @@ @@ -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"

6
contrib/update-unicode/README

@ -1,10 +1,10 @@ @@ -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 @@ -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.

2
contrib/update-unicode/update_unicode.sh

@ -6,7 +6,7 @@ @@ -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 &&

2
exec_cmd.c → exec-cmd.c

@ -1,5 +1,5 @@ @@ -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

0
exec_cmd.h → exec-cmd.h

2
fetch-pack.c

@ -6,7 +6,7 @@ @@ -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"

2
git.c

@ -1,6 +1,6 @@ @@ -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"


2
help.c

@ -1,7 +1,7 @@ @@ -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"

2
http-backend.c

@ -5,7 +5,7 @@ @@ -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"

2
http-fetch.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#include "cache.h"
#include "config.h"
#include "exec_cmd.h"
#include "exec-cmd.h"
#include "http.h"
#include "walker.h"


2
http-push.c

@ -6,7 +6,7 @@ @@ -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"

2
imap-send.c

@ -24,7 +24,7 @@ @@ -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

2
list-objects-filter.c

@ -19,7 +19,7 @@ @@ -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)

2
object.h

@ -37,7 +37,7 @@ struct object_array { @@ -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

2
remote-curl.c

@ -4,7 +4,7 @@ @@ -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"

2
remote-testsvn.c

@ -3,7 +3,7 @@ @@ -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"

0
replace_object.c → replace-object.c

2
run-command.c

@ -1,6 +1,6 @@ @@ -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"

2
sequencer.c

@ -7,7 +7,7 @@ @@ -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"

0
sha1_file.c → sha1-file.c

0
sha1_name.c → sha1-name.c

2
shell.c

@ -1,6 +1,6 @@ @@ -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"


0
unicode_width.h → unicode-width.h

2
upload-pack.c

@ -6,7 +6,7 @@ @@ -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"

2
utf8.c

@ -81,7 +81,7 @@ static int git_wcwidth(ucs_char_t ch) @@ -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)

0
write_or_die.c → write-or-die.c

Loading…
Cancel
Save