1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 17:53:12 +01:00
Find a file
Jeff King b8ba629264 Makefile: fold MISC_H into LIB_H
We keep a list of most of the header files in LIB_H, but
some are split out into MISC_H. The original point
of LIB_H was that it would force recompilation of C files
when any of the library headers changed. It was
over-encompassing, since not all C files included all of the
library headers; this made it simple to maintain, but meant
that we sometimes recompiled when it was not necessary.

Over time, some new headers were omitted from LIB_H, and
rules were added to the Makefile for a few specific targets
to explicitly depend on them. This avoided some unnecessary
recompilation at the cost of having to maintain the
dependency list of those targets manually (e.g., d349a03).

Later, we needed a complete list of headers from which we
should extract strings to localized. Thus 1b8b2e4 introduced
MISC_H to mention all header files not included in LIB_H,
and the concatenation of the two lists is fed to xgettext.
Headers mentioned as dependencies must also be manually
added to MISC_H to receive the benefits of localization.

Having to update multiple locations manually is a pain and
has led to errors. For example, see "git log -Swt-status.h
Makefile" for some back-and-forth between the two locations.
Or the fact that column.h was never added to MISC_H, and
therefore was not localized (which is fixed by this patch).
Moreover, the benefits of keeping these few headers out of
LIB_H is not that great, for two reasons:

  1. The better way to do this is by auto-computing the
     dependencies, which is more accurate and less work to
     maintain. If your compiler supports it, we turn on
     computed header dependencies by default these days. So
     these manual dependencies are used only for people who
     do not have gcc at all (which increases the chance of
     them becoming stale, as many developers will never even
     use them).

  2. Even if you do not have gcc, the manual header
     dependencies do not help all that much.  They obviously
     cannot help with an initial compilation (since their
     purpose is to avoid unnecessary recompilation when a
     header changes), which means they are only useful when
     building a new version of git in the working tree that
     held an existing build (e.g., after checkout or during a
     bisection). But since a change of a header in LIB_H
     will force recompilation, and given that the vast
     majority of headers are in LIB_H, most version changes
     will result in a full rebuild anyway.

Let's just fold MISC_H into LIB_H and get rid of these
manual rules. The worst case is some extra compilation, but
even that is unlikely to matter due to the reasons above.

The one exception is that we should keep common-cmds.h
separate. Because it is generated, the computed dependencies
do not handle it properly, and we must keep separate
individual dependencies on it. Let's therefore rename MISC_H
to GENERATED_H to make it more clear what should go in it.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-20 12:57:42 -07:00
block-sha1
builtin move git_version_string into version.c 2012-06-03 13:11:34 -07:00
compat Merge branch 'nd/threaded-index-pack' 2012-05-14 11:50:40 -07:00
contrib Merge branch 'fc/git-complete-helper-fix' 2012-05-25 12:07:09 -07:00
Documentation Update draft release notes to 1.7.11 2012-06-01 13:29:48 -07:00
git-gui
git_remote_helpers
gitk-git Merge branch 'pt/gitk' 2012-04-02 15:06:25 -07:00
gitweb Merge branch 'kk/gitweb-omit-expensive' 2012-04-29 17:52:00 -07:00
mergetools
perl git-svn: make Git::SVN::Fetcher a separate file 2012-05-29 00:17:59 +00:00
po l10n: Set nplurals of zh_CN.po from 1 to 2 2012-06-01 17:43:38 +08:00
ppc
t Merge branch 'ef/maint-rebase-error-message' 2012-06-01 13:28:25 -07:00
templates
vcs-svn remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
xdiff Merge branch 'rs/xdiff-fast-hash-fix' 2012-05-25 12:05:02 -07:00
.gitattributes
.gitignore Merge branch 'nd/columns' 2012-05-03 15:13:31 -07:00
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c Merge branch 'rs/archive-tree-in-tip-simplify' 2012-05-23 13:35:22 -07:00
archive-zip.c archive-zip: streaming for deflated files 2012-05-03 10:22:57 -07:00
archive.c Merge branch 'rs/archive-tree-in-tip-simplify' 2012-05-23 13:35:22 -07:00
archive.h archive: delegate blob reading to backend 2012-05-03 10:22:56 -07:00
argv-array.c argv-array: add a new "pushl" method 2012-04-18 16:16:38 -07:00
argv-array.h argv-array: add a new "pushl" method 2012-04-18 16:16:38 -07:00
attr.c
attr.h correct a few doubled-word nits in comments and documentation 2012-03-28 11:18:35 -07:00
base85.c
bisect.c bisect: copy filename string obtained from git_path() 2012-05-03 13:15:35 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h move git_version_string into version.c 2012-06-03 13:11:34 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'nd/i18n' 2012-05-02 13:51:35 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/ident-gecos-strbuf' 2012-05-29 13:09:13 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c column: support piping stdout to external git-column process 2012-04-27 09:26:38 -07:00
column.h column: support piping stdout to external git-column process 2012-04-27 09:26:38 -07:00
combine-diff.c Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint 2012-04-26 10:35:26 -07:00
command-list.txt Merge branch 'nd/columns' 2012-05-03 15:13:31 -07:00
commit.c ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT 2012-05-24 17:16:41 -07:00
commit.h Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint 2012-05-14 11:46:16 -07:00
config.c move identity config parsing to ident.c 2012-05-22 09:07:53 -07:00
config.mak.in
configure.ac
connect.c
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c i18n: mark relative dates for translation 2012-04-24 14:55:48 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c diff --no-index: don't leak buffers in queue_diff 2012-05-16 11:18:06 -07:00
diff.c Merge branch 'jc/diff-algo-cleanup' into maint 2012-05-11 11:19:27 -07:00
diff.h Merge branch 'jc/diff-algo-cleanup' into maint 2012-05-11 11:19:27 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c dir: simplify fill_directory() 2012-05-11 14:31:32 -07:00
dir.h
editor.c
entry.c
environment.c move git_default_* variables to ident.c 2012-05-22 09:07:53 -07:00
exec_cmd.c run-command: treat inaccessible directories as ENOENT 2012-04-05 16:24:13 -07:00
exec_cmd.h
fast-import.c fast-import: tighten parsing of datarefs 2012-04-10 14:34:02 -07:00
fetch-pack.h fetch-pack: new --stdin option to read refs from stdin 2012-04-02 13:47:15 -07:00
fixup-builtins
fmt-merge-msg.h
fsck.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
fsck.h
generate-cmdlist.sh i18n: help: mark strings for translation 2012-04-24 14:55:48 -07:00
gettext.c
gettext.h
git-add--interactive.perl add--interactive: ignore unmerged entries in patch mode 2012-04-05 09:01:03 -07:00
git-am.sh Merge branch 'jc/am-report-3way' 2012-04-20 15:49:37 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h ident: report passwd errors with a more friendly message 2012-05-22 09:08:20 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh difftool: teach difftool to handle directory diffs 2012-04-23 11:59:34 -07:00
git-difftool.perl difftool: print list of valid tools with '--tool-help' 2012-04-23 12:00:42 -07:00
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py Merge branch 'ld/git-p4-tags-and-labels' 2012-05-17 15:21:46 -07:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh git-rebase: add keep_empty flag 2012-04-24 15:24:14 -07:00
git-rebase--interactive.sh Merge branch 'nl/rebase-i-cheat-sheet' into maint 2012-05-10 10:29:14 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'ef/maint-rebase-error-message' 2012-06-01 13:28:25 -07:00
git-relink.perl Consistently use perl from /usr/bin/ for scripts 2012-05-01 13:32:17 -07:00
git-remote-testgit.py git-remote-testgit: fix race when spawning fast-import 2012-04-24 14:54:24 -07:00
git-repack.sh gc: do not explode objects which will be immediately pruned 2012-04-11 11:09:49 -07:00
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh git-sh-setup: define workaround wrappers before they are used 2012-05-16 10:44:04 -07:00
git-stash.sh stash: use eval_gettextln correctly 2012-04-14 16:31:02 -07:00
git-submodule.sh submodules: print "registered for path" message only once 2012-05-29 13:52:23 -07:00
git-svn.perl git-svn: make Git::SVN::Fetcher a separate file 2012-05-29 00:17:59 +00:00
GIT-VERSION-GEN Git 1.7.11-rc0 2012-05-25 12:19:45 -07:00
git-web--browse.sh
git.c move git_version_string into version.c 2012-06-03 13:11:34 -07:00
git.spec.in spec: add missing build dependency 2012-04-06 10:15:11 -07:00
gpg-interface.c ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT 2012-05-24 17:16:41 -07:00
gpg-interface.h
graph.c Add output_prefix_length to diff_options 2012-04-16 11:28:30 -07:00
graph.h
grep.c Merge branch 'rs/maint-grep-F' into maint 2012-06-01 13:01:41 -07:00
grep.h Merge branch 'rs/maint-grep-F' into maint 2012-06-01 13:01:41 -07:00
hash.c
hash.h
help.c move git_version_string into version.c 2012-06-03 13:11:34 -07:00
help.h Merge branch 'nd/columns' 2012-05-03 15:13:31 -07:00
hex.c
http-backend.c http-backend: respect existing GIT_COMMITTER_* variables 2012-03-30 09:13:02 -07:00
http-fetch.c
http-push.c http-push: do not access git_default_email directly 2012-05-22 09:07:52 -07:00
http-walker.c
http.c http: get default user-agent from git_user_agent 2012-06-03 13:11:54 -07:00
http.h
ident.c Merge branch 'jk/ident-gecos-strbuf' 2012-05-29 13:09:13 -07:00
imap-send.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
INSTALL INSTALL: update asciidoc recommendation 2012-05-30 09:07:04 -07:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
ll-merge.h
lockfile.c
log-tree.c format-patch: refactor get_patch_filename 2012-05-22 09:08:50 -07:00
log-tree.h format-patch: refactor get_patch_filename 2012-05-22 09:08:50 -07:00
mailmap.c
mailmap.h
Makefile Makefile: fold MISC_H into LIB_H 2012-06-20 12:57:42 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'jc/diff-algo-cleanup' into maint 2012-05-11 11:19:27 -07:00
merge-recursive.h
mergesort.c mergesort: rename it to llist_mergesort() 2012-04-17 11:07:01 -07:00
mergesort.h mergesort: rename it to llist_mergesort() 2012-04-17 11:07:01 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c
notes.h
object.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
object.h Teach revision walking machinery to walk multiple times sequencially 2012-03-30 08:57:49 -07:00
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Stop starting pager recursively 2012-04-27 09:26:38 -07:00
parse-options-cb.c
parse-options.c i18n: parseopt: lookup help and argument translations when showing usage 2012-05-08 10:46:13 -07:00
parse-options.h i18n: parseopt: lookup help and argument translations when showing usage 2012-05-08 10:46:13 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/pretty-commit-header-incomplete-line' into maint 2012-06-01 13:01:33 -07:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'jc/index-v4' 2012-05-02 13:51:13 -07:00
README
reflog-walk.c Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint 2012-05-14 11:46:16 -07:00
reflog-walk.h Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint 2012-05-14 11:46:16 -07:00
refs.c Merge branch 'rs/refs-string-slice' 2012-05-29 13:09:02 -07:00
refs.h refs: store references hierarchically 2012-04-10 15:55:55 -07:00
RelNotes Start preparing for 1.7.10.4 2012-06-01 13:23:11 -07:00
remote-curl.c Merge branch 'jk/maint-push-progress' into maint 2012-05-10 10:08:54 -07:00
remote.c add sorting infrastructure for list refs 2012-05-22 13:31:03 -07:00
remote.h add sorting infrastructure for list refs 2012-05-22 13:31:03 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'rs/commit-list-append' 2012-04-29 17:51:30 -07:00
revision.h Merge branch 'cb/cherry-pick-rev-path-confusion' 2012-04-27 13:58:02 -07:00
run-command.c Merge branch 'jk/run-command-eacces' into maint 2012-04-26 10:51:41 -07:00
run-command.h
send-pack.h
sequencer.c Merge branch 'nh/empty-rebase' 2012-06-01 13:28:19 -07:00
sequencer.h git-cherry-pick: Add keep-redundant-commits option 2012-04-24 14:52:12 -07:00
server-info.c
setup.c properly keep track of current working directory 2012-04-15 13:28:02 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'hv/submodule-alt-odb' 2012-05-23 13:35:06 -07:00
sha1_name.c i18n: mark @{upstream} error messages for translation 2012-04-15 14:26:08 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf: convenience format functions with \n automatically appended 2012-04-24 14:55:48 -07:00
strbuf.h strbuf: convenience format functions with \n automatically appended 2012-04-24 14:55:48 -07:00
streaming.c pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .." 2012-05-18 14:21:19 -07:00
streaming.h streaming: void pointer instead of char pointer 2012-05-03 10:22:56 -07:00
string-list.c
string-list.h
submodule.c Merge branch 'hv/submodule-alt-odb' 2012-05-23 13:35:06 -07:00
submodule.h Merge branch 'hv/submodule-recurse-push' 2012-04-24 14:40:20 -07:00
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-credential.c
test-ctype.c
test-date.c i18n: mark relative dates for translation 2012-04-24 14:55:48 -07:00
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c mergesort: rename it to llist_mergesort() 2012-04-17 11:07:01 -07:00
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-revision-walking.c Teach revision walking machinery to walk multiple times sequencially 2012-03-30 08:57:49 -07:00
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-subprocess.c test-subprocess: fix segfault without arguments 2012-04-10 12:28:20 -07:00
test-svn-fe.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c remove superfluous newlines in error messages 2012-04-30 15:45:51 -07:00
transport.c Merge branch 'ct/advise-push-default' into maint 2012-05-11 11:18:43 -07:00
transport.h Merge branch 'hv/submodule-recurse-push' 2012-04-24 14:40:20 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'maint' 2012-05-20 15:45:35 -07:00
unpack-trees.h
upload-pack.c
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c varint: make it available outside the context of pack 2012-04-03 16:24:44 -07:00
varint.h varint: make it available outside the context of pack 2012-04-03 16:24:44 -07:00
version.c version: add git_user_agent function 2012-06-03 13:11:52 -07:00
version.h version: add git_user_agent function 2012-06-03 13:11:52 -07:00
walker.c
walker.h
wrap-for-bin.sh
wrapper.c ident: report passwd errors with a more friendly message 2012-05-22 09:08:20 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'jk/maint-status-porcelain-z-b' into HEAD 2012-05-08 04:55:35 -04:00
wt-status.h status: refactor colopts handling 2012-05-08 04:57:42 -04:00
xdiff-interface.c xdiff: remove emit_func() and xdi_diff_hunks() 2012-05-09 14:08:42 -07:00
xdiff-interface.h xdiff: remove emit_func() and xdi_diff_hunks() 2012-05-09 14:08:42 -07:00
zlib.c

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://marc.theaimsgroup.com/?l=git and other archival
sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.