├── t ├── t5100 │ ├── empty │ ├── msg0013 │ ├── patch0007 │ ├── patch0008 │ ├── patch0013 │ ├── msg0016 │ ├── msg0017 │ ├── msg0015 │ ├── rfc2047-info-0005 │ ├── rfc2047-info-0007 │ ├── rfc2047-info-0008 │ ├── rfc2047-info-0009 │ ├── rfc2047-info-0006 │ ├── rfc2047-info-0010 │ ├── rfc2047-info-0011 │ ├── msg0001 │ ├── msg0006 │ ├── msg0007 │ ├── msg0009 │ ├── msg0016--no-inbody-headers │ ├── msg0011 │ ├── msg0015--no-inbody-headers │ ├── patch0005 │ ├── msg0008 │ ├── rfc2047-info-0002 │ ├── rfc2047-info-0003 │ ├── info0015 │ ├── nul-plain │ ├── .gitattributes │ ├── info0006 │ ├── info0009 │ ├── info0013 │ ├── info0014 │ ├── info0016 │ ├── info0002 │ ├── info0003 │ ├── info0007 │ ├── info0011 │ ├── info0017 │ ├── patch0017 │ ├── info0008 │ ├── rfc2047-info-0001 │ ├── patch0015 │ ├── patch0016 │ ├── info0001 │ ├── rfc2047-info-0004 │ ├── patch0015--no-inbody-headers │ ├── patch0016--no-inbody-headers │ ├── info-from.expect │ ├── info0005 │ ├── info0012 │ ├── info0015--no-inbody-headers │ ├── info0016--no-inbody-headers │ ├── info0010 │ ├── msg0004 │ ├── info0004 │ ├── info0014--scissors │ ├── msg0014--scissors │ ├── msg0010 │ ├── info-from.in │ ├── msg0012 │ ├── msg0003 │ ├── patch0001 │ ├── patch0002 │ ├── patch0003 │ ├── patch0006 │ ├── msg0005 │ ├── patch0009 │ └── patch0011 ├── t0110 │ ├── url-11 │ ├── url-1 │ ├── url-2 │ ├── url-10 │ ├── url-3 │ ├── url-4 │ ├── url-5 │ ├── url-6 │ ├── url-7 │ ├── url-8 │ ├── url-9 │ └── README ├── t9151 │ └── .gitignore ├── lib-httpd │ ├── passwd │ ├── ssl.cnf │ └── broken-smart-http.sh ├── t3900 │ ├── 1-UTF-8.txt │ ├── 2-UTF-8.txt │ ├── UTF-16.txt │ ├── eucJP.txt │ ├── ISO8859-1.txt │ └── ISO-2022-JP.txt ├── t9601 │ └── cvsroot │ │ ├── .gitattributes │ │ └── CVSROOT │ │ └── .gitignore ├── t9602 │ └── cvsroot │ │ ├── .gitattributes │ │ └── CVSROOT │ │ └── .gitignore ├── t9603 │ └── cvsroot │ │ ├── .gitattributes │ │ └── CVSROOT │ │ └── .gitignore ├── t9604 │ └── cvsroot │ │ ├── .gitattributes │ │ └── CVSROOT │ │ └── .gitignore ├── valgrind │ └── .gitignore ├── t4252 │ ├── file-1-0 │ ├── file-2-0 │ ├── am-test-5-2 │ ├── am-test-6-1 │ ├── am-test-1-1 │ ├── am-test-5-1 │ ├── am-test-1-2 │ ├── am-test-2-1 │ ├── am-test-2-2 │ ├── am-test-3-1 │ ├── am-test-3-2 │ ├── am-test-4-1 │ └── am-test-4-2 ├── t4013 │ ├── diff.diff-tree_master │ ├── diff.diff-tree_-p_master │ ├── diff.diff-tree_initial │ ├── diff.diff-tree_-p_initial │ ├── diff.diff-tree_-r_initial │ ├── diff.diff_--no-index_dir_dir3 │ ├── diff.diff-tree_--pretty_initial │ ├── diff.diff-tree_--pretty_-p_initial │ ├── diff.diff-tree_-r_--abbrev_initial │ ├── diff.diff_--name-status_dir2_dir │ ├── diff.log_-SF_master_--max-count=0 │ ├── diff.diff-tree_-r_--abbrev=4_initial │ ├── diff.diff-tree_--patch-with-raw_initial │ ├── diff.diff-tree_--pretty=oneline_initial │ ├── diff.diff-tree_--pretty_--stat_initial │ ├── diff.diff-tree_--patch-with-stat_initial │ ├── diff.diff-tree_--pretty_--summary_initial │ ├── diff.diff-tree_--pretty=oneline_-p_initial │ ├── diff.diff_--dirstat_initial_rearrange │ ├── diff.diff_--dirstat_master~1_master~2 │ ├── diff.config_format.subjectprefix_DIFFERENT_PREFIX │ ├── diff.diff-tree_--pretty_--patch-with-raw_initial │ ├── diff.diff-tree_--pretty_--patch-with-stat_initial │ ├── diff.diff-tree_--pretty_--stat_--summary_initial │ ├── diff.diff_--no-index_--name-status_dir2_dir │ ├── diff.diff_--dirstat-by-file_initial_rearrange │ ├── diff.diff_--no-index_--name-status_--_dir2_dir │ ├── diff.diff-tree_--pretty=oneline_--patch-with-raw_initial │ ├── diff.diff-tree_--pretty=oneline_--patch-with-stat_initial │ ├── diff.diff_--stat_initial..side │ ├── diff.diff_-r_--stat_initial..side │ ├── diff.diff-tree_-c_--stat_master │ ├── diff.diff-tree_--cc_--stat_master │ ├── diff.show_initial │ ├── diff.log_-GF_master │ ├── diff.log_-SF_master │ ├── diff.log_-S_F_master │ ├── diff.diff-tree_-c_--stat_--summary_master │ ├── diff.diff-tree_--cc_--stat_--summary_master │ ├── diff.log_-SF_master_--max-count=1 │ ├── diff.log_-SF_master_--max-count=2 │ ├── diff.diff_--cached_--_file0 │ ├── diff.diff-tree_-c_--abbrev_master │ ├── diff.diff-tree_--cc_--stat_--summary_side │ ├── diff.diff-tree_-c_--stat_--summary_side │ ├── diff.diff-tree_--root_-r_--abbrev=4_initial │ ├── diff.diff-tree_--root_--abbrev_initial │ ├── diff.diff-tree_--root_-r_--abbrev_initial │ ├── diff.whatchanged_-SF_master │ ├── diff.show_--stat_side │ ├── diff.diff-tree_--pretty_--root_--summary_initial │ ├── diff.diff-tree_--pretty_--root_--stat_initial │ ├── diff.show_--stat_--summary_side │ ├── diff.diff-tree_--pretty_--root_--summary_-r_initial │ ├── diff.log_-GF_-p_master │ ├── diff.log_-SF_-p_master │ ├── diff.whatchanged_-SF_-p_master │ ├── diff.diff-tree_-c_master │ ├── diff.diff-tree_--root_initial │ ├── diff.diff-tree_--root_-r_initial │ ├── diff.diff_master_master^_side │ ├── diff.diff-tree_--pretty=oneline_--root_initial │ ├── diff.diff-tree_--pretty_--root_--stat_--summary_initial │ ├── diff.rev-list_--children_HEAD │ ├── diff.rev-list_--parents_HEAD │ ├── diff.diff-tree_--cc_master │ ├── diff.diff-tree_--pretty_side │ ├── diff.diff_initial..side │ ├── diff.diff_-r_initial..side │ ├── diff.diff-tree_--pretty_--root_initial │ ├── diff.diff_--abbrev_initial..side │ ├── diff.log_-GF_-p_--pickaxe-all_master │ ├── diff.diff_--cached │ ├── diff.diff-tree_--root_-p_initial │ └── diff.show_--first-parent_master ├── .gitignore ├── t8005 │ ├── utf8.txt │ ├── sjis.txt │ └── euc-japan.txt ├── perf │ ├── .gitignore │ ├── Makefile │ ├── p0002-read-cache.sh │ ├── min_time.perl │ └── p4001-diff-no-index.sh ├── t7500 │ ├── add-content │ ├── add-signed-off │ ├── edit-content │ ├── add-comments │ ├── add-content-and-comment │ └── add-whitespaced-content ├── .gitattributes ├── t4135 │ ├── .gitignore │ ├── diff-plain.diff │ ├── diff-with quote.diff │ ├── diff-with spaces.diff │ ├── diff-with tab.diff │ ├── git-plain.diff │ ├── diff-with backslash.diff │ ├── git-with spaces.diff │ ├── git-with tab.diff │ ├── git-with backslash.diff │ ├── add-plain.diff │ ├── git-with quote.diff │ ├── damaged.diff │ ├── add-with spaces.diff │ ├── add-with tab.diff │ ├── add-with backslash.diff │ ├── add-with quote.diff │ ├── damaged-tz.diff │ └── funny-tz.diff ├── t5004 │ └── empty.zip ├── t3901-8859-1.txt ├── t4101 │ ├── diff.0-1 │ ├── diff.1-0 │ ├── diff.0-2 │ ├── diff.2-0 │ ├── diff.2-3 │ ├── diff.3-2 │ ├── diff.0-3 │ ├── diff.1-2 │ ├── diff.1-3 │ ├── diff.2-1 │ ├── diff.3-0 │ └── diff.3-1 ├── t4201-shortlog.sh ├── test-binary-1.png ├── test-binary-2.png ├── lib-gpg │ ├── pubring.gpg │ ├── random_seed │ ├── secring.gpg │ └── trustdb.gpg ├── t4034 │ ├── fortran │ │ ├── pre │ │ ├── post │ │ └── expect │ ├── tex │ │ ├── pre │ │ ├── post │ │ └── expect │ ├── html │ │ ├── pre │ │ ├── post │ │ └── expect │ ├── matlab │ │ ├── pre │ │ └── post │ ├── ada │ │ ├── post │ │ └── pre │ ├── perl │ │ ├── pre │ │ ├── post │ │ └── expect │ ├── python │ │ ├── pre │ │ └── post │ ├── ruby │ │ ├── pre │ │ └── post │ ├── pascal │ │ ├── pre │ │ └── post │ ├── php │ │ ├── pre │ │ └── post │ ├── csharp │ │ ├── pre │ │ └── post │ ├── objc │ │ ├── pre │ │ └── post │ ├── cpp │ │ ├── pre │ │ └── post │ ├── java │ │ ├── pre │ │ └── post │ └── bibtex │ │ ├── pre │ │ └── post ├── t5515 │ ├── fetch.master_.._.git │ ├── fetch.br-unconfig_.._.git │ ├── fetch.master_.._.git_one │ ├── fetch.br-unconfig_.._.git_one │ ├── fetch.master_.._.git_one_two │ ├── fetch.br-unconfig_.._.git_one_two │ ├── refs.master_.._.git │ ├── refs.br-unconfig_.._.git │ ├── refs.master_.._.git_one │ ├── refs.br-unconfig_.._.git_one │ ├── refs.master_.._.git_one_two │ ├── refs.br-unconfig_.._.git_one_two │ ├── fetch.master_.._.git_tag_tag-one_tag_tag-three │ ├── fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three │ ├── fetch.master_--tags_.._.git │ ├── fetch.br-branches-one │ ├── fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file │ ├── fetch.br-unconfig_--tags_.._.git │ ├── fetch.master_branches-one │ ├── fetch.br-branches-default │ ├── fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file │ ├── fetch.br-unconfig_branches-one │ └── fetch.master_branches-default ├── t4100 │ ├── t-apply-8.expect │ ├── t-apply-9.expect │ ├── t-apply-4.expect │ ├── t-apply-2.expect │ ├── t-apply-6.expect │ ├── t-apply-4.patch │ ├── t-apply-8.patch │ ├── t-apply-9.patch │ ├── t-apply-7.expect │ ├── t-apply-3.expect │ └── t-apply-1.expect ├── t5003 │ └── infozip-symlinks.zip ├── t4020 │ └── diff.NUL ├── t1509 │ └── excludes ├── t3901-utf8.txt ├── t4110 │ ├── patch2.patch │ ├── patch4.patch │ ├── patch5.patch │ ├── expect │ ├── patch3.patch │ └── patch1.patch ├── t0302-credential-store.sh ├── t4033-diff-patience.sh ├── t4050-diff-histogram.sh ├── Git-SVN │ ├── Utils │ │ ├── can_compress.t │ │ └── collapse_dotdot.t │ └── 00compile.t ├── t4109 │ ├── expect-2 │ ├── expect-3 │ ├── expect-1 │ ├── patch1.patch │ ├── patch2.patch │ ├── patch3.patch │ └── patch4.patch ├── lib-pager.sh ├── t9136-git-svn-recreated-branch-empty-file.sh ├── t8001-annotate.sh ├── t4136-apply-check.sh ├── t6110-rev-list-sparse.sh ├── t8002-blame.sh ├── t9121-git-svn-fetch-renamed-dir.sh ├── t0200 │ ├── test.sh │ └── test.perl ├── lib-bash.sh ├── t1003-read-tree-prefix.sh ├── t7062-wtstatus-ignorecase.sh ├── t1009-read-tree-new-index.sh ├── t2011-checkout-invalid-head.sh ├── t3103-ls-tree-misc.sh ├── t9135-git-svn-moved-branch-empty-file.sh ├── t3102-ls-tree-wildcards.sh ├── t2014-switch.sh ├── t2006-checkout-index-basic.sh └── t0055-beyond-symlinks.sh ├── po └── .gitignore ├── gitk-git ├── po │ └── .gitignore └── .gitignore ├── contrib ├── emacs │ ├── .gitignore │ └── Makefile ├── mw-to-git │ ├── t │ │ ├── install-wiki │ │ │ └── .gitignore │ │ ├── .gitignore │ │ ├── t9364-pull-by-rev.sh │ │ └── t9365-continuing-queries.sh │ ├── .gitignore │ ├── git-remote-mediawiki.txt │ └── bin-wrapper │ │ └── git ├── credential │ ├── osxkeychain │ │ ├── .gitignore │ │ └── Makefile │ ├── gnome-keyring │ │ ├── .gitignore │ │ └── Makefile │ ├── netrc │ │ ├── Makefile │ │ └── test.netrc │ └── wincred │ │ └── Makefile ├── svn-fe │ ├── .gitignore │ └── svn-fe.c ├── subtree │ ├── .gitignore │ └── README ├── examples │ ├── README │ ├── git-merge-ours.sh │ └── git-log.sh ├── git-shell-commands │ ├── list │ └── help ├── remote-helpers │ └── Makefile └── fast-import │ └── git-p4.README ├── git-gui ├── po │ ├── .gitignore │ └── glossary │ │ └── Makefile ├── lib │ └── git-gui.ico ├── macosx │ └── git-gui.icns ├── .gitignore └── .gitattributes ├── RelNotes ├── Documentation ├── .gitattributes ├── technical │ ├── .gitignore │ ├── api-decorate.txt │ ├── api-grep.txt │ ├── api-xdiff-interface.txt │ ├── api-quote.txt │ ├── api-object-access.txt │ ├── api-index-skel.txt │ └── api-in-core-index.txt ├── RelNotes │ ├── 1.7.4.5.txt │ ├── 1.5.5.4.txt │ ├── 1.7.3.2.txt │ ├── 1.7.0.9.txt │ ├── 1.7.1.4.txt │ ├── 1.7.2.5.txt │ ├── 1.7.11.1.txt │ ├── 1.7.6.2.txt │ ├── 1.8.5.1.txt │ ├── 1.5.5.3.txt │ ├── 1.5.3.1.txt │ ├── 1.5.4.7.txt │ ├── 1.5.5.6.txt │ ├── 1.5.6.6.txt │ ├── 1.6.3.1.txt │ ├── 1.8.1.4.txt │ ├── 1.8.4.4.txt │ ├── 1.7.7.7.txt │ ├── 1.7.0.6.txt │ ├── 1.7.9.7.txt │ ├── 1.7.10.5.txt │ ├── 1.8.4.5.txt │ ├── 1.7.9.6.txt │ ├── 1.7.3.1.txt │ ├── 1.8.0.3.txt │ ├── 1.7.0.8.txt │ ├── 1.7.1.3.txt │ ├── 1.7.2.4.txt │ ├── 1.8.3.1.txt │ ├── 1.5.5.5.txt │ ├── 1.7.8.3.txt │ ├── 1.7.7.4.txt │ ├── 1.7.0.7.txt │ ├── 1.7.7.5.txt │ ├── 1.5.0.4.txt │ ├── 1.5.0.7.txt │ └── 1.5.0.6.txt ├── .gitignore ├── git-remote-helpers.txto ├── manpage-base-url.xsl.in ├── fix-texi.perl ├── docbook.xsl ├── git-stage.txt ├── sequencer.txt ├── git-fsck-objects.txt ├── git-merge-one-file.txt ├── gitglossary.txt ├── git-init-db.txt ├── user-manual.conf ├── manpage-normal.xsl ├── git-verify-tag.txt ├── git-unpack-file.txt ├── manpage-1.72.xsl ├── git-parse-remote.txt └── git-show-index.txt ├── mergetools ├── gvimdiff ├── gvimdiff2 ├── vimdiff2 ├── kompare ├── tkdiff ├── diffmerge ├── diffuse ├── opendiff ├── ecmerge ├── araxis ├── codecompare ├── bc3 ├── emerge └── kdiff3 ├── templates ├── .gitignore ├── branches-- ├── this--description ├── hooks--post-update.sample ├── info--exclude ├── hooks--pre-applypatch.sample └── hooks--applypatch-msg.sample ├── compat ├── vcbuild │ └── include │ │ ├── alloca.h │ │ ├── utime.h │ │ └── sys │ │ ├── param.h │ │ └── time.h ├── msvc.c ├── terminal.h ├── mkdtemp.c ├── strtoimax.c ├── strtoumax.c ├── strlcpy.c ├── basename.c ├── win32 │ └── syslog.h ├── pread.c ├── strcasestr.c ├── mkdir.c └── hstrerror.c ├── gitweb └── static │ ├── git-logo.png │ └── git-favicon.png ├── perl └── .gitignore ├── .gitattributes ├── unimplemented.sh ├── reachable.h ├── unix-socket.h ├── fmt-merge-msg.h ├── version.h ├── merge-blobs.h ├── levenshtein.h ├── varint.h ├── prompt.h ├── vcs-svn ├── svndiff.h ├── svndump.h └── sliding_window.h ├── sigchain.h ├── thread-utils.h ├── test-read-cache.c ├── sideband.h ├── mailmap.h ├── test-index-version.c ├── test-mktemp.c ├── bulk-checkin.h ├── check_bindir ├── wildmatch.h ├── test-sigchain.c ├── list-objects.h ├── sha1-lookup.h ├── decorate.h ├── test-scrap-cache-tree.c ├── send-pack.h ├── pack-revindex.h ├── test-subprocess.c ├── generate-cmdlist.sh ├── url.h ├── builtin └── annotate.c ├── progress.h ├── exec_cmd.h ├── streaming.h ├── patch-ids.h ├── notes-cache.h └── shortlog.h /t/t5100/empty: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /t/t5100/msg0013: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /t/t5100/patch0007: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /t/t5100/patch0008: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /t/t5100/patch0013: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /po/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /gitk-git/po/.gitignore: -------------------------------------------------------------------------------- 1 | *.msg 2 | -------------------------------------------------------------------------------- /t/t0110/url-11: -------------------------------------------------------------------------------- 1 | x://q/€߿ࠀ�𐀀𯿽 2 | -------------------------------------------------------------------------------- /contrib/emacs/.gitignore: -------------------------------------------------------------------------------- 1 | *.elc 2 | -------------------------------------------------------------------------------- /git-gui/po/.gitignore: -------------------------------------------------------------------------------- 1 | *.msg 2 | *~ 3 | -------------------------------------------------------------------------------- /t/t0110/url-1: -------------------------------------------------------------------------------- 1 | x://q/ 2 | -------------------------------------------------------------------------------- /t/t0110/url-2: -------------------------------------------------------------------------------- 1 | x://q/ 2 | -------------------------------------------------------------------------------- /t/t9151/.gitignore: -------------------------------------------------------------------------------- 1 | foo 2 | foo.svn 3 | -------------------------------------------------------------------------------- /RelNotes: -------------------------------------------------------------------------------- 1 | Documentation/RelNotes/2.0.0.txt -------------------------------------------------------------------------------- /t/t5100/msg0016: -------------------------------------------------------------------------------- 1 | and some content 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/msg0017: -------------------------------------------------------------------------------- 1 | New content here 2 | 3 | -------------------------------------------------------------------------------- /t/lib-httpd/passwd: -------------------------------------------------------------------------------- 1 | user@host:xb4E8pqD81KQs 2 | -------------------------------------------------------------------------------- /t/t3900/1-UTF-8.txt: -------------------------------------------------------------------------------- 1 | ÄËÑÏÖ 2 | 3 | Ábçdèfg 4 | -------------------------------------------------------------------------------- /t/t5100/msg0015: -------------------------------------------------------------------------------- 1 | - a list 2 | - of stuff 3 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0005: -------------------------------------------------------------------------------- 1 | Subject: (a) 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0007: -------------------------------------------------------------------------------- 1 | Subject: (ab) 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0008: -------------------------------------------------------------------------------- 1 | Subject: (ab) 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0009: -------------------------------------------------------------------------------- 1 | Subject: (ab) 2 | 3 | -------------------------------------------------------------------------------- /t/t9601/cvsroot/.gitattributes: -------------------------------------------------------------------------------- 1 | * -whitespace 2 | -------------------------------------------------------------------------------- /t/t9602/cvsroot/.gitattributes: -------------------------------------------------------------------------------- 1 | * -whitespace 2 | -------------------------------------------------------------------------------- /t/t9603/cvsroot/.gitattributes: -------------------------------------------------------------------------------- 1 | * -whitespace 2 | -------------------------------------------------------------------------------- /t/t9604/cvsroot/.gitattributes: -------------------------------------------------------------------------------- 1 | * -whitespace 2 | -------------------------------------------------------------------------------- /t/valgrind/.gitignore: -------------------------------------------------------------------------------- 1 | /bin/ 2 | /templates 3 | -------------------------------------------------------------------------------- /Documentation/.gitattributes: -------------------------------------------------------------------------------- 1 | *.txt whitespace 2 | -------------------------------------------------------------------------------- /Documentation/technical/.gitignore: -------------------------------------------------------------------------------- 1 | api-index.txt 2 | -------------------------------------------------------------------------------- /mergetools/gvimdiff: -------------------------------------------------------------------------------- 1 | . "$MERGE_TOOLS_DIR/vimdiff" 2 | -------------------------------------------------------------------------------- /mergetools/gvimdiff2: -------------------------------------------------------------------------------- 1 | . "$MERGE_TOOLS_DIR/vimdiff" 2 | -------------------------------------------------------------------------------- /mergetools/vimdiff2: -------------------------------------------------------------------------------- 1 | . "$MERGE_TOOLS_DIR/vimdiff" 2 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0006: -------------------------------------------------------------------------------- 1 | Subject: (a b) 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0010: -------------------------------------------------------------------------------- 1 | Subject: (a b) 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0011: -------------------------------------------------------------------------------- 1 | Subject: (a b) 2 | 3 | -------------------------------------------------------------------------------- /templates/.gitignore: -------------------------------------------------------------------------------- 1 | blt 2 | boilerplates.made 3 | -------------------------------------------------------------------------------- /compat/vcbuild/include/alloca.h: -------------------------------------------------------------------------------- 1 | #include 2 | -------------------------------------------------------------------------------- /compat/vcbuild/include/utime.h: -------------------------------------------------------------------------------- 1 | #include 2 | -------------------------------------------------------------------------------- /gitk-git/.gitignore: -------------------------------------------------------------------------------- 1 | /GIT-TCLTK-VARS 2 | /gitk-wish 3 | -------------------------------------------------------------------------------- /t/t4252/file-1-0: -------------------------------------------------------------------------------- 1 | 1 2 | 2 3 | 3 4 | 4 5 | 5 6 | 6 7 | 7 8 | -------------------------------------------------------------------------------- /t/t4252/file-2-0: -------------------------------------------------------------------------------- 1 | 1 2 | 2 3 | 3 4 | 4 5 | 5 6 | 6 7 | 7 8 | -------------------------------------------------------------------------------- /t/t5100/msg0001: -------------------------------------------------------------------------------- 1 | Here is a patch from A U Thor. 2 | 3 | -------------------------------------------------------------------------------- /t/t5100/msg0006: -------------------------------------------------------------------------------- 1 | Here is a patch from A U Thor. 2 | 3 | -------------------------------------------------------------------------------- /contrib/mw-to-git/t/install-wiki/.gitignore: -------------------------------------------------------------------------------- 1 | wikidb.sqlite 2 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree master 2 | $ 3 | -------------------------------------------------------------------------------- /t/t5100/msg0007: -------------------------------------------------------------------------------- 1 | Here is an empty patch from A U Thor. 2 | 3 | -------------------------------------------------------------------------------- /t/t9601/cvsroot/CVSROOT/.gitignore: -------------------------------------------------------------------------------- 1 | history 2 | val-tags 3 | -------------------------------------------------------------------------------- /t/t9602/cvsroot/CVSROOT/.gitignore: -------------------------------------------------------------------------------- 1 | history 2 | val-tags 3 | -------------------------------------------------------------------------------- /t/t9603/cvsroot/CVSROOT/.gitignore: -------------------------------------------------------------------------------- 1 | history 2 | val-tags 3 | -------------------------------------------------------------------------------- /t/t9604/cvsroot/CVSROOT/.gitignore: -------------------------------------------------------------------------------- 1 | history 2 | val-tags 3 | -------------------------------------------------------------------------------- /contrib/mw-to-git/.gitignore: -------------------------------------------------------------------------------- 1 | git-remote-mediawiki 2 | git-mw 3 | -------------------------------------------------------------------------------- /t/.gitignore: -------------------------------------------------------------------------------- 1 | /trash directory* 2 | /test-results 3 | /.prove 4 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-p_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree -p master 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t5100/msg0009: -------------------------------------------------------------------------------- 1 | This is to fix diff-format documentation. 2 | 3 | -------------------------------------------------------------------------------- /t/t8005/utf8.txt: -------------------------------------------------------------------------------- 1 | UTF8_NAME="山田 太郎" 2 | UTF8_MSG="ブレームのテストです。" 3 | -------------------------------------------------------------------------------- /contrib/credential/osxkeychain/.gitignore: -------------------------------------------------------------------------------- 1 | git-credential-osxkeychain 2 | -------------------------------------------------------------------------------- /contrib/svn-fe/.gitignore: -------------------------------------------------------------------------------- 1 | /*.xml 2 | /*.1 3 | /*.html 4 | /svn-fe 5 | -------------------------------------------------------------------------------- /t/perf/.gitignore: -------------------------------------------------------------------------------- 1 | /build/ 2 | /test-results/ 3 | /trash directory*/ 4 | -------------------------------------------------------------------------------- /t/t3900/2-UTF-8.txt: -------------------------------------------------------------------------------- 1 | はれひほふ 2 | 3 | しているのが、いるので。 4 | 濱浜ほれぷりぽれまびぐりろへ。 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-p_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree -p initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-r_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree -r initial 2 | $ 3 | -------------------------------------------------------------------------------- /templates/branches--: -------------------------------------------------------------------------------- 1 | : this is just to ensure the directory exists. 2 | -------------------------------------------------------------------------------- /contrib/credential/gnome-keyring/.gitignore: -------------------------------------------------------------------------------- 1 | git-credential-gnome-keyring 2 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--no-index_dir_dir3: -------------------------------------------------------------------------------- 1 | $ git diff --no-index dir dir3 2 | $ 3 | -------------------------------------------------------------------------------- /t/t7500/add-content: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | echo "commit message" >> "$1" 3 | exit 0 4 | -------------------------------------------------------------------------------- /t/.gitattributes: -------------------------------------------------------------------------------- 1 | t[0-9][0-9][0-9][0-9]/* -whitespace 2 | t0110/url-* binary 3 | -------------------------------------------------------------------------------- /t/t0110/url-10: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-10 -------------------------------------------------------------------------------- /t/t0110/url-3: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-3 -------------------------------------------------------------------------------- /t/t0110/url-4: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-4 -------------------------------------------------------------------------------- /t/t0110/url-5: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-5 -------------------------------------------------------------------------------- /t/t0110/url-6: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-6 -------------------------------------------------------------------------------- /t/t0110/url-7: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-7 -------------------------------------------------------------------------------- /t/t0110/url-8: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-8 -------------------------------------------------------------------------------- /t/t0110/url-9: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t0110/url-9 -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4135/.gitignore: -------------------------------------------------------------------------------- 1 | /file-creation/ 2 | /trad-creation/ 3 | /trad-modification/ 4 | -------------------------------------------------------------------------------- /t/t5004/empty.zip: -------------------------------------------------------------------------------- 1 | PK(fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e -------------------------------------------------------------------------------- /t/t5100/msg0016--no-inbody-headers: -------------------------------------------------------------------------------- 1 | Date: bogus 2 | 3 | and some content 4 | 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_-p_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty -p initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-r_--abbrev_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree -r --abbrev initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--name-status_dir2_dir: -------------------------------------------------------------------------------- 1 | $ git diff --name-status dir2 dir 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-SF_master_--max-count=0: -------------------------------------------------------------------------------- 1 | $ git log -SF master --max-count=0 2 | $ 3 | -------------------------------------------------------------------------------- /t/t5100/msg0011: -------------------------------------------------------------------------------- 1 | Here comes a commit log message, and 2 | its second line is here. 3 | -------------------------------------------------------------------------------- /t/t5100/msg0015--no-inbody-headers: -------------------------------------------------------------------------------- 1 | From: bogosity 2 | - a list 3 | - of stuff 4 | -------------------------------------------------------------------------------- /t/t8005/sjis.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t8005/sjis.txt -------------------------------------------------------------------------------- /contrib/mw-to-git/t/.gitignore: -------------------------------------------------------------------------------- 1 | WEB/ 2 | wiki/ 3 | trash directory.t*/ 4 | test-results/ 5 | -------------------------------------------------------------------------------- /t/t3900/UTF-16.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t3900/UTF-16.txt -------------------------------------------------------------------------------- /t/t3900/eucJP.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t3900/eucJP.txt -------------------------------------------------------------------------------- /t/t3901-8859-1.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t3901-8859-1.txt -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-r_--abbrev=4_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree -r --abbrev=4 initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4101/diff.0-1: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,2 +1,3 @@ 4 | a 5 | b 6 | +c 7 | -------------------------------------------------------------------------------- /t/t4101/diff.1-0: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,3 +1,2 @@ 4 | a 5 | b 6 | -c 7 | -------------------------------------------------------------------------------- /t/t4201-shortlog.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t4201-shortlog.sh -------------------------------------------------------------------------------- /t/t5100/patch0005: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t5100/patch0005 -------------------------------------------------------------------------------- /t/test-binary-1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/test-binary-1.png -------------------------------------------------------------------------------- /t/test-binary-2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/test-binary-2.png -------------------------------------------------------------------------------- /t/lib-gpg/pubring.gpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/lib-gpg/pubring.gpg -------------------------------------------------------------------------------- /t/lib-gpg/random_seed: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/lib-gpg/random_seed -------------------------------------------------------------------------------- /t/lib-gpg/secring.gpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/lib-gpg/secring.gpg -------------------------------------------------------------------------------- /t/lib-gpg/trustdb.gpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/lib-gpg/trustdb.gpg -------------------------------------------------------------------------------- /t/t3900/ISO8859-1.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t3900/ISO8859-1.txt -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--patch-with-raw_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --patch-with-raw initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty=oneline_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty=oneline initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--stat_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --stat initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t5100/msg0008: -------------------------------------------------------------------------------- 1 | >Here is an empty patch from A U Thor. 2 | 3 | Hey you forgot the patch! 4 | 5 | -------------------------------------------------------------------------------- /t/t7500/add-signed-off: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | echo "Signed-off-by: foo " >> "$1" 3 | exit 0 4 | -------------------------------------------------------------------------------- /t/t8005/euc-japan.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t8005/euc-japan.txt -------------------------------------------------------------------------------- /compat/vcbuild/include/sys/param.h: -------------------------------------------------------------------------------- 1 | /* Intentionally empty file to support building git with MSVC */ 2 | -------------------------------------------------------------------------------- /compat/vcbuild/include/sys/time.h: -------------------------------------------------------------------------------- 1 | /* Intentionally empty file to support building git with MSVC */ 2 | -------------------------------------------------------------------------------- /contrib/credential/netrc/Makefile: -------------------------------------------------------------------------------- 1 | test: 2 | ./test.pl 3 | 4 | testverbose: 5 | ./test.pl -d -v 6 | -------------------------------------------------------------------------------- /git-gui/lib/git-gui.ico: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/git-gui/lib/git-gui.ico -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--patch-with-stat_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --patch-with-stat initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--summary_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --summary initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4034/fortran/pre: -------------------------------------------------------------------------------- 1 | print *, "Hello World!" 2 | 3 | DO10I = 1,10 4 | DO10I = 1,10 5 | DO10I = 1,10 6 | -------------------------------------------------------------------------------- /t/t4034/tex/pre: -------------------------------------------------------------------------------- 1 | \section{Something} 2 | \emph{Macro style} 3 | {\em State toggle style} 4 | \\[1em] 5 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_.._.git: -------------------------------------------------------------------------------- 1 | # master ../.git 2 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../ 3 | -------------------------------------------------------------------------------- /gitweb/static/git-logo.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/gitweb/static/git-logo.png -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty=oneline_-p_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty=oneline -p initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4034/html/pre: -------------------------------------------------------------------------------- 1 | content 2 | content 3 | content &entity; 4 | -------------------------------------------------------------------------------- /templates/this--description: -------------------------------------------------------------------------------- 1 | Unnamed repository; edit this file 'description' to name the repository. 2 | -------------------------------------------------------------------------------- /contrib/subtree/.gitignore: -------------------------------------------------------------------------------- 1 | *~ 2 | git-subtree 3 | git-subtree.xml 4 | git-subtree.1 5 | mainline 6 | subproj 7 | -------------------------------------------------------------------------------- /git-gui/macosx/git-gui.icns: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/git-gui/macosx/git-gui.icns -------------------------------------------------------------------------------- /gitweb/static/git-favicon.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/gitweb/static/git-favicon.png -------------------------------------------------------------------------------- /t/t4013/diff.diff_--dirstat_initial_rearrange: -------------------------------------------------------------------------------- 1 | $ git diff --dirstat initial rearrange 2 | 100.0% dir/ 3 | $ 4 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--dirstat_master~1_master~2: -------------------------------------------------------------------------------- 1 | $ git diff --dirstat master~1 master~2 2 | 40.0% dir/ 3 | $ 4 | -------------------------------------------------------------------------------- /t/t4034/fortran/post: -------------------------------------------------------------------------------- 1 | print *, "Hello World?" 2 | 3 | DO10I = 1,10 4 | DO 10 I = 1,10 5 | DO 1 0 I = 1,10 6 | -------------------------------------------------------------------------------- /t/t4100/t-apply-8.expect: -------------------------------------------------------------------------------- 1 | t/t4100-apply-stat.sh | 2 +- 2 | 1 file changed, 1 insertion(+), 1 deletion(-) 3 | -------------------------------------------------------------------------------- /t/t4100/t-apply-9.expect: -------------------------------------------------------------------------------- 1 | t/t4100-apply-stat.sh | 2 +- 2 | 1 file changed, 1 insertion(+), 1 deletion(-) 3 | -------------------------------------------------------------------------------- /t/t5003/infozip-symlinks.zip: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/twitter-archive/git/HEAD/t/t5003/infozip-symlinks.zip -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_.._.git: -------------------------------------------------------------------------------- 1 | # br-unconfig ../.git 2 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../ 3 | -------------------------------------------------------------------------------- /t/t7500/edit-content: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | sed -e "s/intermediate/edited/g" <"$1" >"$1-" 3 | mv "$1-" "$1" 4 | exit 0 5 | -------------------------------------------------------------------------------- /t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX: -------------------------------------------------------------------------------- 1 | $ git config format.subjectprefix DIFFERENT_PREFIX 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --patch-with-raw initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--patch-with-stat_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --patch-with-stat initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --stat --summary initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t4034/tex/post: -------------------------------------------------------------------------------- 1 | \section{Something new} 2 | \textbf{Macro style} 3 | {\bfseries State toggle style} 4 | \\[1cm] 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--no-index_--name-status_dir2_dir: -------------------------------------------------------------------------------- 1 | $ git diff --no-index --name-status dir2 dir 2 | A dir/sub 3 | $ 4 | -------------------------------------------------------------------------------- /t/t4101/diff.0-2: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,2 +1,2 @@ 4 | a 5 | -b 6 | +b 7 | \ No newline at end of file 8 | -------------------------------------------------------------------------------- /t/t4101/diff.2-0: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,2 +1,2 @@ 4 | a 5 | -b 6 | \ No newline at end of file 7 | +b 8 | -------------------------------------------------------------------------------- /t/t4101/diff.2-3: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,2 +1,3 @@ 4 | a 5 | +c 6 | b 7 | \ No newline at end of file 8 | -------------------------------------------------------------------------------- /t/t4101/diff.3-2: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,3 +1,2 @@ 4 | a 5 | -c 6 | b 7 | \ No newline at end of file 8 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0002: -------------------------------------------------------------------------------- 1 | Author: Olle Järnefors 2 | Email: ojarnef@admin.kth.se 3 | Subject: Time for ISO 10646? 4 | 5 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_.._.git_one: -------------------------------------------------------------------------------- 1 | # master ../.git one 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | -------------------------------------------------------------------------------- /Documentation/technical/api-decorate.txt: -------------------------------------------------------------------------------- 1 | decorate API 2 | ============ 3 | 4 | Talk about 5 | 6 | (Linus) 7 | -------------------------------------------------------------------------------- /perl/.gitignore: -------------------------------------------------------------------------------- 1 | perl.mak 2 | perl.mak.old 3 | MYMETA.json 4 | MYMETA.yml 5 | blib 6 | blibdirs 7 | pm_to_blib 8 | PM.stamp 9 | -------------------------------------------------------------------------------- /t/t3900/ISO-2022-JP.txt: -------------------------------------------------------------------------------- 1 | $B$O$l$R$[$U(B 2 | 3 | $B$7$F$$$k$N$,!"$$$k$N$G!#(B 4 | $B_@IM$[$l$W$j$]$l$^$S$0$j$m$X!#(B 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--dirstat-by-file_initial_rearrange: -------------------------------------------------------------------------------- 1 | $ git diff --dirstat-by-file initial rearrange 2 | 100.0% dir/ 3 | $ 4 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir: -------------------------------------------------------------------------------- 1 | $ git diff --no-index --name-status -- dir2 dir 2 | A dir/sub 3 | $ 4 | -------------------------------------------------------------------------------- /t/t4101/diff.0-3: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,2 +1,3 @@ 4 | a 5 | -b 6 | +c 7 | +b 8 | \ No newline at end of file 9 | -------------------------------------------------------------------------------- /t/t4101/diff.1-2: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,3 +1,2 @@ 4 | a 5 | -b 6 | -c 7 | +b 8 | \ No newline at end of file 9 | -------------------------------------------------------------------------------- /t/t4101/diff.1-3: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,3 +1,3 @@ 4 | a 5 | -b 6 | c 7 | +b 8 | \ No newline at end of file 9 | -------------------------------------------------------------------------------- /t/t4101/diff.2-1: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,2 +1,3 @@ 4 | a 5 | -b 6 | \ No newline at end of file 7 | +b 8 | +c 9 | -------------------------------------------------------------------------------- /t/t4101/diff.3-0: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,3 +1,2 @@ 4 | a 5 | -c 6 | -b 7 | \ No newline at end of file 8 | +b 9 | -------------------------------------------------------------------------------- /t/t4101/diff.3-1: -------------------------------------------------------------------------------- 1 | --- a/frotz 2 | +++ b/frotz 3 | @@ -1,3 +1,3 @@ 4 | a 5 | +b 6 | c 7 | -b 8 | \ No newline at end of file 9 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0003: -------------------------------------------------------------------------------- 1 | Author: Patrik Fältström 2 | Email: paf@nada.kth.se 3 | Subject: RFC-HDR care and feeding 4 | 5 | -------------------------------------------------------------------------------- /t/t7500/add-comments: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | echo "# this is a new comment" >> "$1" 3 | echo "# and so is this" >> "$1" 4 | exit 0 5 | -------------------------------------------------------------------------------- /t/t7500/add-content-and-comment: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | echo "commit message" >> "$1" 3 | echo "# comment" >> "$1" 4 | exit 0 5 | 6 | -------------------------------------------------------------------------------- /.gitattributes: -------------------------------------------------------------------------------- 1 | * whitespace=!indent,trail,space 2 | *.[ch] whitespace=indent,trail,space 3 | *.sh whitespace=indent,trail,space 4 | -------------------------------------------------------------------------------- /mergetools/kompare: -------------------------------------------------------------------------------- 1 | can_merge () { 2 | return 1 3 | } 4 | 5 | diff_cmd () { 6 | "$merge_tool_path" "$LOCAL" "$REMOTE" 7 | } 8 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty=oneline --patch-with-raw initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t5100/info0015: -------------------------------------------------------------------------------- 1 | Author: 2 | Email: 3 | Subject: check bogus body header (from) 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/nul-plain: -------------------------------------------------------------------------------- 1 | From nobody Mon Sep 17 00:00:00 2001 2 | 3 | --- 4 | diff --git a/foo b/foo 5 | Some strange test 6 | 7 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_.._.git_one: -------------------------------------------------------------------------------- 1 | # br-unconfig ../.git one 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | -------------------------------------------------------------------------------- /unimplemented.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | echo >&2 "fatal: git was built without support for `basename $0` (@@REASON@@)." 4 | exit 128 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-stat_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty=oneline --patch-with-stat initial 2 | $ 3 | -------------------------------------------------------------------------------- /t/t5100/.gitattributes: -------------------------------------------------------------------------------- 1 | msg* encoding=UTF-8 2 | info* encoding=UTF-8 3 | rfc2047-info-* encoding=UTF-8 4 | sample.mbox encoding=UTF-8 5 | -------------------------------------------------------------------------------- /t/t5100/info0006: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: a commit. 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0009: -------------------------------------------------------------------------------- 1 | Author: F U Bar 2 | Email: f.u.bar@example.com 3 | Subject: updates 4 | Date: Mon, 17 Sep 2001 00:00:00 +0900 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0013: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: a patch 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0014: -------------------------------------------------------------------------------- 1 | Author: Junio Hamano 2 | Email: junkio@cox.net 3 | Subject: BLAH ONE 4 | Date: Thu, 20 Aug 2009 17:18:22 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0016: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: check bogus body header (date) 4 | Date: bogus 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0002: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: another patch 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0003: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: third patch 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0007: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: another patch 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0011: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: Xyzzy 4 | Date: Fri, 8 Aug 2008 13:08:37 +0200 (CEST) 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0017: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: A E I O U 4 | Date: Mon, 17 Sep 2012 14:23:44 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/patch0017: -------------------------------------------------------------------------------- 1 | diff --git a/foo b/foo 2 | index e69de29..d95f3ad 100644 3 | --- a/foo 4 | +++ b/foo 5 | @@ -0,0 +1 @@ 6 | +New content 7 | -------------------------------------------------------------------------------- /t/t7500/add-whitespaced-content: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | sed -e 's/|$//' >>"$1" <<\EOF 3 | 4 | | 5 | commit message | 6 | 7 | EOF 8 | exit 0 9 | -------------------------------------------------------------------------------- /Documentation/technical/api-grep.txt: -------------------------------------------------------------------------------- 1 | grep API 2 | ======== 3 | 4 | Talk about , things like: 5 | 6 | * grep_buffer() 7 | 8 | (JC) 9 | -------------------------------------------------------------------------------- /git-gui/.gitignore: -------------------------------------------------------------------------------- 1 | .DS_Store 2 | config.mak 3 | Git Gui.app* 4 | git-gui.tcl 5 | GIT-VERSION-FILE 6 | GIT-GUI-VARS 7 | git-gui 8 | lib/tclIndex 9 | -------------------------------------------------------------------------------- /t/t4034/html/post: -------------------------------------------------------------------------------- 1 | added content 2 | changed 3 | content &newentity; 4 | -------------------------------------------------------------------------------- /t/t5100/info0008: -------------------------------------------------------------------------------- 1 | Author: Junio C Hamano 2 | Email: junio@kernel.org 3 | Subject: another patch 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0001: -------------------------------------------------------------------------------- 1 | Author: Keith Moore 2 | Email: moore@cs.utk.edu 3 | Subject: If you can read this you understand the example. 4 | 5 | -------------------------------------------------------------------------------- /compat/msvc.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | #include "win32.h" 3 | #include 4 | #include "../strbuf.h" 5 | 6 | #include "mingw.c" 7 | -------------------------------------------------------------------------------- /t/t5100/patch0015: -------------------------------------------------------------------------------- 1 | --- 2 | diff --git a/foo b/foo 3 | index e69de29..d95f3ad 100644 4 | --- a/foo 5 | +++ b/foo 6 | @@ -0,0 +1 @@ 7 | +content 8 | 9 | -------------------------------------------------------------------------------- /t/t5100/patch0016: -------------------------------------------------------------------------------- 1 | --- 2 | diff --git a/foo b/foo 3 | index e69de29..d95f3ad 100644 4 | --- a/foo 5 | +++ b/foo 6 | @@ -0,0 +1 @@ 7 | +content 8 | 9 | -------------------------------------------------------------------------------- /t/t5100/info0001: -------------------------------------------------------------------------------- 1 | Author: A (zzz) U Thor (Comment) 2 | Email: a.u.thor@example.com 3 | Subject: a commit. 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/rfc2047-info-0004: -------------------------------------------------------------------------------- 1 | Author: Nathaniel Borenstein (םולש ןב ילטפנ) 2 | Email: nsb@thumper.bellcore.com 3 | Subject: Test of new header generator 4 | 5 | -------------------------------------------------------------------------------- /t/t4020/diff.NUL: -------------------------------------------------------------------------------- 1 | diff --git a/file b/file 2 | index e019be0..f12ebb8 100644 3 | --- a/file 4 | +++ b/file 5 | @@ -1 +1 @@ 6 | -second 7 | +NULbetweenwords 8 | -------------------------------------------------------------------------------- /t/t5100/patch0015--no-inbody-headers: -------------------------------------------------------------------------------- 1 | --- 2 | diff --git a/foo b/foo 3 | index e69de29..d95f3ad 100644 4 | --- a/foo 5 | +++ b/foo 6 | @@ -0,0 +1 @@ 7 | +content 8 | 9 | -------------------------------------------------------------------------------- /t/t5100/patch0016--no-inbody-headers: -------------------------------------------------------------------------------- 1 | --- 2 | diff --git a/foo b/foo 3 | index e69de29..d95f3ad 100644 4 | --- a/foo 5 | +++ b/foo 6 | @@ -0,0 +1 @@ 7 | +content 8 | 9 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.4.5.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.4.5 Release Notes 2 | ========================== 3 | 4 | This contains only minor documentation fixes accumulated since 1.7.4.4. 5 | -------------------------------------------------------------------------------- /t/t5100/info-from.expect: -------------------------------------------------------------------------------- 1 | Author: bare@example.com 2 | Email: bare@example.com 3 | Subject: testing bare address in from header 4 | Date: Sun, 25 May 2008 00:38:18 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0005: -------------------------------------------------------------------------------- 1 | Author: David Kågedal 2 | Email: davidk@lysator.liu.se 3 | Subject: Fixed two bugs in git-cvsimport-script. 4 | Date: Mon, 15 Aug 2005 20:18:25 +0200 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0012: -------------------------------------------------------------------------------- 1 | Author: Dmitriy Blinov 2 | Email: bda@mnsspb.ru 3 | Subject: Изменён список пакетов необходимых для сборки 4 | Date: Wed, 12 Nov 2008 17:54:41 +0300 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0015--no-inbody-headers: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: check bogus body header (from) 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0016--no-inbody-headers: -------------------------------------------------------------------------------- 1 | Author: A U Thor 2 | Email: a.u.thor@example.com 3 | Subject: check bogus body header (date) 4 | Date: Fri, 9 Jun 2006 00:44:16 -0700 5 | 6 | -------------------------------------------------------------------------------- /compat/terminal.h: -------------------------------------------------------------------------------- 1 | #ifndef COMPAT_TERMINAL_H 2 | #define COMPAT_TERMINAL_H 3 | 4 | char *git_terminal_prompt(const char *prompt, int echo); 5 | 6 | #endif /* COMPAT_TERMINAL_H */ 7 | -------------------------------------------------------------------------------- /t/t1509/excludes: -------------------------------------------------------------------------------- 1 | *.o 2 | *~ 3 | *.bak 4 | *.c 5 | *.h 6 | .git 7 | contrib 8 | Documentation 9 | git-gui 10 | gitk-git 11 | gitweb 12 | t/t4013 13 | t/t5100 14 | t/t5515 15 | -------------------------------------------------------------------------------- /t/t3901-utf8.txt: -------------------------------------------------------------------------------- 1 | : to be sourced in t3901 -- this is utf8 2 | GIT_AUTHOR_NAME="Áéí óú" && 3 | GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME && 4 | export GIT_AUTHOR_NAME GIT_COMMITTER_NAME 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--stat_initial..side: -------------------------------------------------------------------------------- 1 | $ git diff --stat initial..side 2 | dir/sub | 2 ++ 3 | file0 | 3 +++ 4 | file3 | 4 ++++ 5 | 3 files changed, 9 insertions(+) 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_-r_--stat_initial..side: -------------------------------------------------------------------------------- 1 | $ git diff -r --stat initial..side 2 | dir/sub | 2 ++ 3 | file0 | 3 +++ 4 | file3 | 4 ++++ 5 | 3 files changed, 9 insertions(+) 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4110/patch2.patch: -------------------------------------------------------------------------------- 1 | diff --git a/new.txt b/new.txt 2 | --- a/new.txt 3 | +++ b/new.txt 4 | @@ -1,7 +1,3 @@ 5 | -a1 6 | -a11 7 | -a111 8 | -a1111 9 | b1 10 | b11 11 | b111 12 | -------------------------------------------------------------------------------- /t/t4110/patch4.patch: -------------------------------------------------------------------------------- 1 | diff --git a/new.txt b/new.txt 2 | --- a/new.txt 3 | +++ b/new.txt 4 | @@ -1,3 +1,7 @@ 5 | +a1 6 | +a11 7 | +a111 8 | +a1111 9 | b1 10 | b11 11 | b111 12 | -------------------------------------------------------------------------------- /t/t4110/patch5.patch: -------------------------------------------------------------------------------- 1 | diff --git a/new.txt b/new.txt 2 | --- a/new.txt 3 | +++ b/new.txt 4 | @@ -10,3 +10,7 @@ 5 | c11 6 | c111 7 | c1111 8 | +c2 9 | +c22 10 | +c222 11 | +c2222 12 | -------------------------------------------------------------------------------- /t/t4135/diff-plain.diff: -------------------------------------------------------------------------------- 1 | --- postimage.txt.orig 2010-08-18 20:13:31.432002255 -0500 2 | +++ postimage.txt 2010-08-18 20:13:31.432002255 -0500 3 | @@ -1 +1 @@ 4 | -preimage 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t5100/info0010: -------------------------------------------------------------------------------- 1 | Author: Lukas Sandström 2 | Email: lukass@etek.chalmers.se 3 | Subject: git-mailinfo: Fix getting the subject from the body 4 | Date: Thu, 10 Jul 2008 23:41:33 +0200 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/msg0004: -------------------------------------------------------------------------------- 1 | Hello. 2 | 3 | Try all addresses for given remote name until it succeeds. 4 | Also supports IPv6. 5 | 6 | Signed-of-by: Hideaki YOSHIFUJI 7 | 8 | -------------------------------------------------------------------------------- /t/t4034/matlab/pre: -------------------------------------------------------------------------------- 1 | (1) (-1e10) 'b'; 2 | [a] {a} a.b; 3 | ~a; 4 | a*b a.*b a/b a./b a^b a.^b a.\b a.'; 5 | a+b a-b; 6 | a&b a&&b a|b a||b; 7 | ab a>=b; 8 | a==b a~=b; 9 | a,b; 10 | -------------------------------------------------------------------------------- /t/t4135/diff-with quote.diff: -------------------------------------------------------------------------------- 1 | --- "postimage".txt.orig 2010-08-18 20:13:31.744002255 -0500 2 | +++ "postimage".txt 2010-08-18 20:13:31.744002255 -0500 3 | @@ -1 +1 @@ 4 | -preimage 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/diff-with spaces.diff: -------------------------------------------------------------------------------- 1 | --- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500 2 | +++ post image.txt 2010-08-18 20:13:31.544002255 -0500 3 | @@ -1 +1 @@ 4 | -preimage 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/diff-with tab.diff: -------------------------------------------------------------------------------- 1 | --- post image.txt.orig 2010-08-18 20:13:31.616002255 -0500 2 | +++ post image.txt 2010-08-18 20:13:31.616002255 -0500 3 | @@ -1 +1 @@ 4 | -preimage 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/git-plain.diff: -------------------------------------------------------------------------------- 1 | diff --git a/postimage.txt b/postimage.txt 2 | new file mode 100644 3 | index 0000000..eff0c54 4 | --- /dev/null 5 | +++ b/postimage.txt 6 | @@ -0,0 +1 @@ 7 | +postimage 8 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_.._.git_one_two: -------------------------------------------------------------------------------- 1 | # master ../.git one two 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ 4 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.5.4.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.5.4 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.5.5.4 5 | -------------------- 6 | 7 | * "git name-rev --all" used to segfault. 8 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.3.2.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.3.2 Release Notes 2 | ========================== 3 | 4 | This is primarily to push out many documentation fixes accumulated since 5 | the 1.7.3.1 release. 6 | -------------------------------------------------------------------------------- /compat/mkdtemp.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | char *gitmkdtemp(char *template) 4 | { 5 | if (!*mktemp(template) || mkdir(template, 0700)) 6 | return NULL; 7 | return template; 8 | } 9 | -------------------------------------------------------------------------------- /contrib/examples/README: -------------------------------------------------------------------------------- 1 | These are original scripted implementations, kept primarily for their 2 | reference value to any aspiring plumbing users who want to learn how 3 | pieces can be fit together. 4 | -------------------------------------------------------------------------------- /reachable.h: -------------------------------------------------------------------------------- 1 | #ifndef REACHEABLE_H 2 | #define REACHEABLE_H 3 | 4 | struct progress; 5 | extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog, struct progress *); 6 | 7 | #endif 8 | -------------------------------------------------------------------------------- /t/t4034/matlab/post: -------------------------------------------------------------------------------- 1 | (0) (-0e10) 'y'; 2 | [x] {x} x.y; 3 | ~x; 4 | x*y x.*y x/y x./y x^y x.^y x.\y x.'; 5 | x+y x-y; 6 | x&y x&&y x|y x||y; 7 | xy x>=y; 8 | x==y x~=y; 9 | x,y; 10 | -------------------------------------------------------------------------------- /t/t4135/diff-with backslash.diff: -------------------------------------------------------------------------------- 1 | --- post\image.txt.orig 2010-08-18 20:13:31.680002255 -0500 2 | +++ post\image.txt 2010-08-18 20:13:31.680002255 -0500 3 | @@ -1 +1 @@ 4 | -preimage 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t5100/info0004: -------------------------------------------------------------------------------- 1 | Author: YOSHIFUJI Hideaki / 吉藤英明 2 | Email: yoshfuji@linux-ipv6.org 3 | Subject: GIT: Try all addresses for given remote name 4 | Date: Thu, 21 Jul 2005 09:10:36 -0400 (EDT) 5 | 6 | -------------------------------------------------------------------------------- /t/t5100/info0014--scissors: -------------------------------------------------------------------------------- 1 | Author: Junio C Hamano 2 | Email: gitster@pobox.com 3 | Subject: Teach mailinfo to ignore everything before -- >8 -- mark 4 | Date: Thu, 20 Aug 2009 17:18:22 -0700 5 | 6 | -------------------------------------------------------------------------------- /unix-socket.h: -------------------------------------------------------------------------------- 1 | #ifndef UNIX_SOCKET_H 2 | #define UNIX_SOCKET_H 3 | 4 | int unix_stream_connect(const char *path); 5 | int unix_stream_listen(const char *path); 6 | 7 | #endif /* UNIX_SOCKET_H */ 8 | -------------------------------------------------------------------------------- /git-gui/.gitattributes: -------------------------------------------------------------------------------- 1 | * whitespace=indent-with-non-tab,trailing-space,space-before-tab,tabwidth=4 2 | * encoding=US-ASCII 3 | git-gui.sh encoding=UTF-8 4 | /po/*.po encoding=UTF-8 5 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-c_--stat_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree -c --stat master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | dir/sub | 2 ++ 4 | file0 | 3 +++ 5 | 2 files changed, 5 insertions(+) 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4110/expect: -------------------------------------------------------------------------------- 1 | a1 2 | a11 3 | a111 4 | a1111 5 | b1 6 | b11 7 | b111 8 | b1111 9 | b2 10 | b22 11 | b222 12 | b2222 13 | c1 14 | c11 15 | c111 16 | c1111 17 | c2 18 | c22 19 | c222 20 | c2222 21 | -------------------------------------------------------------------------------- /t/t4135/git-with spaces.diff: -------------------------------------------------------------------------------- 1 | diff --git a/post image.txt b/post image.txt 2 | new file mode 100644 3 | index 0000000..eff0c54 4 | --- /dev/null 5 | +++ b/post image.txt 6 | @@ -0,0 +1 @@ 7 | +postimage 8 | -------------------------------------------------------------------------------- /t/t5100/msg0014--scissors: -------------------------------------------------------------------------------- 1 | This teaches mailinfo the scissors -- >8 -- mark; the command ignores 2 | everything before it in the message body. 3 | 4 | Signed-off-by: Junio C Hamano 5 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_.._.git_one_two: -------------------------------------------------------------------------------- 1 | # br-unconfig ../.git one two 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ 4 | -------------------------------------------------------------------------------- /t/t0302-credential-store.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='credential-store tests' 4 | . ./test-lib.sh 5 | . "$TEST_DIRECTORY"/lib-credential.sh 6 | 7 | helper_test store 8 | 9 | test_done 10 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--cc_--stat_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree --cc --stat master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | dir/sub | 2 ++ 4 | file0 | 3 +++ 5 | 2 files changed, 5 insertions(+) 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4013/diff.show_initial: -------------------------------------------------------------------------------- 1 | $ git show initial 2 | commit 444ac553ac7612cc88969031b02b3767fb8a353a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:00:00 2006 +0000 5 | 6 | Initial 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4135/git-with tab.diff: -------------------------------------------------------------------------------- 1 | diff --git "a/post\timage.txt" "b/post\timage.txt" 2 | new file mode 100644 3 | index 0000000..eff0c54 4 | --- /dev/null 5 | +++ "b/post\timage.txt" 6 | @@ -0,0 +1 @@ 7 | +postimage 8 | -------------------------------------------------------------------------------- /Documentation/technical/api-xdiff-interface.txt: -------------------------------------------------------------------------------- 1 | xdiff interface API 2 | =================== 3 | 4 | Talk about our calling convention to xdiff library, including 5 | xdiff_emit_consume_fn. 6 | 7 | (Dscho, JC) 8 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-GF_master: -------------------------------------------------------------------------------- 1 | $ git log -GF master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-SF_master: -------------------------------------------------------------------------------- 1 | $ git log -SF master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-S_F_master: -------------------------------------------------------------------------------- 1 | $ git log -S F master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4135/git-with backslash.diff: -------------------------------------------------------------------------------- 1 | diff --git "a/post\\image.txt" "b/post\\image.txt" 2 | new file mode 100644 3 | index 0000000..eff0c54 4 | --- /dev/null 5 | +++ "b/post\\image.txt" 6 | @@ -0,0 +1 @@ 7 | +postimage 8 | -------------------------------------------------------------------------------- /t/t4110/patch3.patch: -------------------------------------------------------------------------------- 1 | diff --git a/new.txt b/new.txt 2 | --- a/new.txt 3 | +++ b/new.txt 4 | @@ -6,6 +6,10 @@ 5 | b11 6 | b111 7 | b1111 8 | +b2 9 | +b22 10 | +b222 11 | +b2222 12 | c1 13 | c11 14 | c111 15 | -------------------------------------------------------------------------------- /t/t4135/add-plain.diff: -------------------------------------------------------------------------------- 1 | diff -pruN a/postimage.txt b/postimage.txt 2 | --- a/postimage.txt 1969-12-31 18:00:00.000000000 -0600 3 | +++ b/postimage.txt 2010-08-18 20:13:31.484002255 -0500 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/git-with quote.diff: -------------------------------------------------------------------------------- 1 | diff --git "a/\"postimage\".txt" "b/\"postimage\".txt" 2 | new file mode 100644 3 | index 0000000..eff0c54 4 | --- /dev/null 5 | +++ "b/\"postimage\".txt" 6 | @@ -0,0 +1 @@ 7 | +postimage 8 | -------------------------------------------------------------------------------- /Documentation/.gitignore: -------------------------------------------------------------------------------- 1 | *.xml 2 | *.html 3 | *.[1-8] 4 | *.made 5 | *.texi 6 | *.pdf 7 | git.info 8 | gitman.info 9 | howto-index.txt 10 | doc.dep 11 | cmds-*.txt 12 | mergetools-*.txt 13 | manpage-base-url.xsl 14 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-c_--stat_--summary_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree -c --stat --summary master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | dir/sub | 2 ++ 4 | file0 | 3 +++ 5 | 2 files changed, 5 insertions(+) 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4135/damaged.diff: -------------------------------------------------------------------------------- 1 | diff -pruN a/postimage.txt b/postimage.txt 2 | --- a/postimage.txt 1969-12-31 18:00:00.000000000 -0600 3 | +++ b/postimage.txt 2010-08-18 20:13:31.484002255 -0500 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /Documentation/technical/api-quote.txt: -------------------------------------------------------------------------------- 1 | quote API 2 | ========= 3 | 4 | Talk about , things like 5 | 6 | * sq_quote and unquote 7 | * c_style quote and unquote 8 | * quoting for foreign languages 9 | 10 | (JC) 11 | -------------------------------------------------------------------------------- /fmt-merge-msg.h: -------------------------------------------------------------------------------- 1 | #ifndef FMT_MERGE_MSG_H 2 | #define FMT_MERGE_MSG_H 3 | 4 | extern int merge_log_config; 5 | extern int fmt_merge_msg_config(const char *key, const char *value, void *cb); 6 | 7 | #endif /* FMT_MERGE_MSG_H */ 8 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--cc_--stat_--summary_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree --cc --stat --summary master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | dir/sub | 2 ++ 4 | file0 | 3 +++ 5 | 2 files changed, 5 insertions(+) 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4034/ada/post: -------------------------------------------------------------------------------- 1 | Ada.Text_IO.Put_Line("Hello World?"); 2 | 1 1e10 16#FE12#E2 3.141_592 'y' 3 | x+y x-y 4 | x*y x/y 5 | x**y 6 | x(y) 7 | x:=y 8 | x=y x/= y 9 | xy x>=y 10 | x,y 11 | x=>y 12 | x..y 13 | x<>y 14 | -------------------------------------------------------------------------------- /t/t4034/ada/pre: -------------------------------------------------------------------------------- 1 | Ada.Text_IO.Put_Line("Hello World!"); 2 | 1 1e-10 16#FE12#E2 3.141_592 'x' 3 | a+b a-b 4 | a*b a/b 5 | a**b 6 | a(b) 7 | a:=b 8 | a=b a/= b 9 | ab a>=b 10 | a,b 11 | a=>b 12 | a..b 13 | a<>b 14 | -------------------------------------------------------------------------------- /t/t4135/add-with spaces.diff: -------------------------------------------------------------------------------- 1 | diff -pruN a/post image.txt b/post image.txt 2 | --- a/post image.txt 1969-12-31 18:00:00.000000000 -0600 3 | +++ b/post image.txt 2010-08-18 20:13:31.556002255 -0500 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/add-with tab.diff: -------------------------------------------------------------------------------- 1 | diff -pruN a/post image.txt b/post image.txt 2 | --- a/post image.txt 1969-12-31 18:00:00.000000000 -0600 3 | +++ b/post image.txt 2010-08-18 20:13:31.628002255 -0500 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4100/t-apply-4.expect: -------------------------------------------------------------------------------- 1 | t/t0000-basic.sh | 0 2 | t/test-lib.sh | 0 3 | 2 files changed, 0 insertions(+), 0 deletions(-) 4 | mode change 100644 => 100755 t/t0000-basic.sh 5 | mode change 100644 => 100755 t/test-lib.sh 6 | -------------------------------------------------------------------------------- /t/t4135/add-with backslash.diff: -------------------------------------------------------------------------------- 1 | diff -pruN a/post\image.txt b/post\image.txt 2 | --- a/post\image.txt 1969-12-31 18:00:00.000000000 -0600 3 | +++ b/post\image.txt 2010-08-18 20:13:31.692002255 -0500 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/add-with quote.diff: -------------------------------------------------------------------------------- 1 | diff -pruN a/"postimage".txt b/"postimage".txt 2 | --- a/"postimage".txt 1969-12-31 18:00:00.000000000 -0600 3 | +++ b/"postimage".txt 2010-08-18 20:13:31.756002255 -0500 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /version.h: -------------------------------------------------------------------------------- 1 | #ifndef VERSION_H 2 | #define VERSION_H 3 | 4 | extern const char git_version_string[]; 5 | 6 | const char *git_user_agent(void); 7 | const char *git_user_agent_sanitized(void); 8 | 9 | #endif /* VERSION_H */ 10 | -------------------------------------------------------------------------------- /merge-blobs.h: -------------------------------------------------------------------------------- 1 | #ifndef MERGE_BLOBS_H 2 | #define MERGE_BLOBS_H 3 | 4 | #include "blob.h" 5 | 6 | extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *); 7 | 8 | #endif /* MERGE_BLOBS_H */ 9 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-SF_master_--max-count=1: -------------------------------------------------------------------------------- 1 | $ git log -SF master --max-count=1 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-SF_master_--max-count=2: -------------------------------------------------------------------------------- 1 | $ git log -SF master --max-count=2 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | $ 8 | -------------------------------------------------------------------------------- /levenshtein.h: -------------------------------------------------------------------------------- 1 | #ifndef LEVENSHTEIN_H 2 | #define LEVENSHTEIN_H 3 | 4 | int levenshtein(const char *string1, const char *string2, 5 | int swap_penalty, int substitution_penalty, 6 | int insertion_penalty, int deletion_penalty); 7 | 8 | #endif 9 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--cached_--_file0: -------------------------------------------------------------------------------- 1 | diff --git a/file0 b/file0 2 | new file mode 100644 3 | index 0000000..10a8a9f 4 | --- /dev/null 5 | +++ b/file0 6 | @@ -0,0 +1,9 @@ 7 | +1 8 | +2 9 | +3 10 | +4 11 | +5 12 | +6 13 | +A 14 | +B 15 | +C 16 | -------------------------------------------------------------------------------- /t/t5100/msg0010: -------------------------------------------------------------------------------- 1 | "Subject: " isn't in the static array "header", and thus 2 | memcmp("Subject: ", header[i], 7) will never match. 3 | 4 | Signed-off-by: Lukas Sandström 5 | Signed-off-by: Junio C Hamano 6 | -------------------------------------------------------------------------------- /varint.h: -------------------------------------------------------------------------------- 1 | #ifndef VARINT_H 2 | #define VARINT_H 3 | 4 | #include "git-compat-util.h" 5 | 6 | extern int encode_varint(uintmax_t, unsigned char *); 7 | extern uintmax_t decode_varint(const unsigned char **); 8 | 9 | #endif /* VARINT_H */ 10 | -------------------------------------------------------------------------------- /templates/hooks--post-update.sample: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # 3 | # An example hook script to prepare a packed repository for use over 4 | # dumb transports. 5 | # 6 | # To enable this hook, rename this file to "post-update". 7 | 8 | exec git update-server-info 9 | -------------------------------------------------------------------------------- /t/t4100/t-apply-2.expect: -------------------------------------------------------------------------------- 1 | Makefile | 2 +- 2 | git-fetch-script | 5 ----- 3 | git-pull-script | 34 +--------------------------------- 4 | 3 files changed, 2 insertions(+), 39 deletions(-) 5 | copy git-pull-script => git-fetch-script (87%) 6 | -------------------------------------------------------------------------------- /t/t5100/info-from.in: -------------------------------------------------------------------------------- 1 | From 667d8940e719cddee1cfe237cbbe215e20270b09 Mon Sep 17 00:00:00 2001 2 | From: bare@example.com 3 | Date: Sun, 25 May 2008 00:38:18 -0700 4 | Subject: [PATCH] testing bare address in from header 5 | 6 | commit message 7 | --- 8 | patch 9 | -------------------------------------------------------------------------------- /contrib/subtree/README: -------------------------------------------------------------------------------- 1 | 2 | Please read git-subtree.txt for documentation. 3 | 4 | Please don't contact me using github mail; it's slow, ugly, and worst of 5 | all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to 6 | help. 7 | 8 | Avery 9 | -------------------------------------------------------------------------------- /prompt.h: -------------------------------------------------------------------------------- 1 | #ifndef PROMPT_H 2 | #define PROMPT_H 3 | 4 | #define PROMPT_ASKPASS (1<<0) 5 | #define PROMPT_ECHO (1<<1) 6 | 7 | char *git_prompt(const char *prompt, int flags); 8 | char *git_getpass(const char *prompt); 9 | 10 | #endif /* PROMPT_H */ 11 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-c_--abbrev_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree -c --abbrev master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | ::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub 4 | ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0 5 | $ 6 | -------------------------------------------------------------------------------- /t/t4033-diff-patience.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='patience diff algorithm' 4 | 5 | . ./test-lib.sh 6 | . "$TEST_DIRECTORY"/lib-diff-alternative.sh 7 | 8 | test_diff_frobnitz "patience" 9 | 10 | test_diff_unique "patience" 11 | 12 | test_done 13 | -------------------------------------------------------------------------------- /t/t4110/patch1.patch: -------------------------------------------------------------------------------- 1 | diff --git a/new.txt b/new.txt 2 | new file mode 100644 3 | --- /dev/null 4 | +++ b/new.txt 5 | @@ -0,0 +1,12 @@ 6 | +a1 7 | +a11 8 | +a111 9 | +a1111 10 | +b1 11 | +b11 12 | +b111 13 | +b1111 14 | +c1 15 | +c11 16 | +c111 17 | +c1111 18 | -------------------------------------------------------------------------------- /t/lib-httpd/ssl.cnf: -------------------------------------------------------------------------------- 1 | RANDFILE = $ENV::RANDFILE_PATH 2 | 3 | [ req ] 4 | default_bits = 1024 5 | distinguished_name = req_distinguished_name 6 | prompt = no 7 | [ req_distinguished_name ] 8 | commonName = 127.0.0.1 9 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--cc_--stat_--summary_side: -------------------------------------------------------------------------------- 1 | $ git diff-tree --cc --stat --summary side 2 | c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 | dir/sub | 2 ++ 4 | file0 | 3 +++ 5 | file3 | 4 ++++ 6 | 3 files changed, 9 insertions(+) 7 | create mode 100644 file3 8 | $ 9 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-c_--stat_--summary_side: -------------------------------------------------------------------------------- 1 | $ git diff-tree -c --stat --summary side 2 | c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 | dir/sub | 2 ++ 4 | file0 | 3 +++ 5 | file3 | 4 ++++ 6 | 3 files changed, 9 insertions(+) 7 | create mode 100644 file3 8 | $ 9 | -------------------------------------------------------------------------------- /t/t4050-diff-histogram.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='histogram diff algorithm' 4 | 5 | . ./test-lib.sh 6 | . "$TEST_DIRECTORY"/lib-diff-alternative.sh 7 | 8 | test_diff_frobnitz "histogram" 9 | 10 | test_diff_unique "histogram" 11 | 12 | test_done 13 | -------------------------------------------------------------------------------- /t/t4100/t-apply-6.expect: -------------------------------------------------------------------------------- 1 | Makefile | 2 +- 2 | git-fetch-script | 41 +++++++++++++++++++++++++++++++++++++++++ 3 | git-pull-script | 34 +--------------------------------- 4 | 3 files changed, 43 insertions(+), 34 deletions(-) 5 | create git-fetch-script 6 | -------------------------------------------------------------------------------- /t/t5100/msg0012: -------------------------------------------------------------------------------- 1 | textlive-* исправлены на texlive-* 2 | docutils заменён на python-docutils 3 | 4 | Действительно, оказалось, что rest2web вытягивает за собой 5 | python-docutils. В то время как сам rest2web не нужен. 6 | 7 | Signed-off-by: Dmitriy Blinov 8 | -------------------------------------------------------------------------------- /vcs-svn/svndiff.h: -------------------------------------------------------------------------------- 1 | #ifndef SVNDIFF_H_ 2 | #define SVNDIFF_H_ 3 | 4 | struct line_buffer; 5 | struct sliding_view; 6 | 7 | extern int svndiff0_apply(struct line_buffer *delta, off_t delta_len, 8 | struct sliding_view *preimage, FILE *postimage); 9 | 10 | #endif 11 | -------------------------------------------------------------------------------- /compat/strtoimax.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | intmax_t gitstrtoimax (const char *nptr, char **endptr, int base) 4 | { 5 | #if defined(NO_STRTOULL) 6 | return strtol(nptr, endptr, base); 7 | #else 8 | return strtoll(nptr, endptr, base); 9 | #endif 10 | } 11 | -------------------------------------------------------------------------------- /sigchain.h: -------------------------------------------------------------------------------- 1 | #ifndef SIGCHAIN_H 2 | #define SIGCHAIN_H 3 | 4 | typedef void (*sigchain_fun)(int); 5 | 6 | int sigchain_push(int sig, sigchain_fun f); 7 | int sigchain_pop(int sig); 8 | 9 | void sigchain_push_common(sigchain_fun f); 10 | 11 | #endif /* SIGCHAIN_H */ 12 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --root -r --abbrev=4 initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a 3 | :000000 100644 0000... 35d2... A dir/sub 4 | :000000 100644 0000... 01e7... A file0 5 | :000000 100644 0000... 01e7... A file2 6 | $ 7 | -------------------------------------------------------------------------------- /thread-utils.h: -------------------------------------------------------------------------------- 1 | #ifndef THREAD_COMPAT_H 2 | #define THREAD_COMPAT_H 3 | 4 | #ifndef NO_PTHREADS 5 | #include 6 | 7 | extern int online_cpus(void); 8 | extern int init_recursive_mutex(pthread_mutex_t*); 9 | 10 | #endif 11 | #endif /* THREAD_COMPAT_H */ 12 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.0.9.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.0.9 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.0.8 5 | -------------------- 6 | 7 | * "gitweb" can sometimes be tricked into parrotting a filename argument 8 | given in a request without properly quoting. 9 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.1.4.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.1.4 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.1.3 5 | -------------------- 6 | 7 | * "gitweb" can sometimes be tricked into parrotting a filename argument 8 | given in a request without properly quoting. 9 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.2.5.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.2.5 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.2.4 5 | -------------------- 6 | 7 | * "gitweb" can sometimes be tricked into parrotting a filename argument 8 | given in a request without properly quoting. 9 | -------------------------------------------------------------------------------- /compat/strtoumax.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | uintmax_t gitstrtoumax (const char *nptr, char **endptr, int base) 4 | { 5 | #if defined(NO_STRTOULL) 6 | return strtoul(nptr, endptr, base); 7 | #else 8 | return strtoull(nptr, endptr, base); 9 | #endif 10 | } 11 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--root_--abbrev_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --root --abbrev initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a 3 | :000000 040000 0000000... da7a33f... A dir 4 | :000000 100644 0000000... 01e79c3... A file0 5 | :000000 100644 0000000... 01e79c3... A file2 6 | $ 7 | -------------------------------------------------------------------------------- /templates/info--exclude: -------------------------------------------------------------------------------- 1 | # git ls-files --others --exclude-from=.git/info/exclude 2 | # Lines that start with '#' are comments. 3 | # For a project mostly in C, the following would be a good set of 4 | # exclude patterns (uncomment them if you want to use them): 5 | # *.[oa] 6 | # *~ 7 | -------------------------------------------------------------------------------- /test-read-cache.c: -------------------------------------------------------------------------------- 1 | #include "cache.h" 2 | 3 | int main (int argc, char **argv) 4 | { 5 | int i, cnt = 1; 6 | if (argc == 2) 7 | cnt = strtol(argv[1], NULL, 0); 8 | for (i = 0; i < cnt; i++) { 9 | read_cache(); 10 | discard_cache(); 11 | } 12 | return 0; 13 | } 14 | -------------------------------------------------------------------------------- /t/perf/Makefile: -------------------------------------------------------------------------------- 1 | -include ../../config.mak 2 | export GIT_TEST_OPTIONS 3 | 4 | all: perf 5 | 6 | perf: pre-clean 7 | ./run 8 | 9 | pre-clean: 10 | rm -rf test-results 11 | 12 | clean: 13 | rm -rf build "trash directory".* test-results 14 | 15 | .PHONY: all perf pre-clean clean 16 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--root_-r_--abbrev_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --root -r --abbrev initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a 3 | :000000 100644 0000000... 35d242b... A dir/sub 4 | :000000 100644 0000000... 01e79c3... A file0 5 | :000000 100644 0000000... 01e79c3... A file2 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4013/diff.whatchanged_-SF_master: -------------------------------------------------------------------------------- 1 | $ git whatchanged -SF master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | 8 | :100644 100644 8422d40... cead32e... M dir/sub 9 | $ 10 | -------------------------------------------------------------------------------- /t/t4100/t-apply-4.patch: -------------------------------------------------------------------------------- 1 | ceede59ea90cebad52ba9c8263fef3fb6ef17593 (from 368f99d57e8ed17243f2e164431449d48bfca2fb) 2 | diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh 3 | old mode 100644 4 | new mode 100755 5 | diff --git a/t/test-lib.sh b/t/test-lib.sh 6 | old mode 100644 7 | new mode 100755 8 | -------------------------------------------------------------------------------- /Documentation/git-remote-helpers.txto: -------------------------------------------------------------------------------- 1 | git-remote-helpers 2 | ================== 3 | 4 | This document has been moved to linkgit:gitremote-helpers[1]. 5 | 6 | Please let the owners of the referring site know so that they can update the 7 | link you clicked to get here. 8 | 9 | Thanks. 10 | -------------------------------------------------------------------------------- /mergetools/tkdiff: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" 3 | } 4 | 5 | merge_cmd () { 6 | if $base_present 7 | then 8 | "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" 9 | else 10 | "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" 11 | fi 12 | } 13 | -------------------------------------------------------------------------------- /t/Git-SVN/Utils/can_compress.t: -------------------------------------------------------------------------------- 1 | #!/usr/bin/perl 2 | 3 | use strict; 4 | use warnings; 5 | 6 | use Test::More 'no_plan'; 7 | 8 | use Git::SVN::Utils qw(can_compress); 9 | 10 | # !! is the "convert this to boolean" operator. 11 | is !!can_compress(), !!eval { require Compress::Zlib }; 12 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.11.1.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.11.1 Release Notes 2 | =========================== 3 | 4 | Fixes since v1.7.11 5 | ------------------- 6 | 7 | * The cross links in the HTML version of manual pages were broken. 8 | 9 | Also contains minor typofixes and documentation updates. 10 | -------------------------------------------------------------------------------- /t/perf/p0002-read-cache.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description="Tests performance of reading the index" 4 | 5 | . ./perf-lib.sh 6 | 7 | test_perf_default_repo 8 | 9 | count=1000 10 | test_perf "read_cache/discard_cache $count times" " 11 | test-read-cache $count 12 | " 13 | 14 | test_done 15 | -------------------------------------------------------------------------------- /t/t5100/msg0003: -------------------------------------------------------------------------------- 1 | Here is a patch from A U Thor. This addresses the issue raised in the 2 | message: 3 | 4 | From: Nit Picker 5 | Subject: foo is too old 6 | Message-Id: 7 | 8 | Hopefully this would fix the problem stated there. 9 | 10 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.6.2.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.6.2 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.6.1 5 | -------------------- 6 | 7 | * v1.7.6.1 broke "git push --quiet"; it used to be a no-op against an old 8 | version of Git running on the other end, but v1.7.6.1 made it abort. 9 | -------------------------------------------------------------------------------- /contrib/git-shell-commands/list: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | print_if_bare_repo=' 4 | if "$(git --git-dir="$1" rev-parse --is-bare-repository)" = true 5 | then 6 | printf "%s\n" "${1#./}" 7 | fi 8 | ' 9 | 10 | find -type d -name "*.git" -exec sh -c "$print_if_bare_repo" -- \{} \; -prune 2>/dev/null 11 | -------------------------------------------------------------------------------- /t/t5100/patch0001: -------------------------------------------------------------------------------- 1 | --- 2 | foo | 2 +- 3 | 1 files changed, 1 insertions(+), 1 deletions(-) 4 | 5 | diff --git a/foo b/foo 6 | index 9123cdc..918dcf8 100644 7 | --- a/foo 8 | +++ b/foo 9 | @@ -1 +1 @@ 10 | -Fri Jun 9 00:44:04 PDT 2006 11 | +Fri Jun 9 00:44:13 PDT 2006 12 | -- 13 | 1.4.0.g6f2b 14 | 15 | -------------------------------------------------------------------------------- /t/t5100/patch0002: -------------------------------------------------------------------------------- 1 | --- 2 | foo | 2 +- 3 | 1 files changed, 1 insertions(+), 1 deletions(-) 4 | 5 | diff --git a/foo b/foo 6 | index 9123cdc..918dcf8 100644 7 | --- a/foo 8 | +++ b/foo 9 | @@ -1 +1 @@ 10 | -Fri Jun 9 00:44:04 PDT 2006 11 | +Fri Jun 9 00:44:13 PDT 2006 12 | -- 13 | 1.4.0.g6f2b 14 | 15 | -------------------------------------------------------------------------------- /t/t5100/patch0003: -------------------------------------------------------------------------------- 1 | --- 2 | foo | 2 +- 3 | 1 files changed, 1 insertions(+), 1 deletions(-) 4 | 5 | diff --git a/foo b/foo 6 | index 9123cdc..918dcf8 100644 7 | --- a/foo 8 | +++ b/foo 9 | @@ -1 +1 @@ 10 | -Fri Jun 9 00:44:04 PDT 2006 11 | +Fri Jun 9 00:44:13 PDT 2006 12 | -- 13 | 1.4.0.g6f2b 14 | 15 | -------------------------------------------------------------------------------- /t/t5100/patch0006: -------------------------------------------------------------------------------- 1 | --- 2 | foo | 2 +- 3 | 1 files changed, 1 insertions(+), 1 deletions(-) 4 | 5 | diff --git a/foo b/foo 6 | index 9123cdc..918dcf8 100644 7 | --- a/foo 8 | +++ b/foo 9 | @@ -1 +1 @@ 10 | -Fri Jun 9 00:44:04 PDT 2006 11 | +Fri Jun 9 00:44:13 PDT 2006 12 | -- 13 | 1.4.0.g6f2b 14 | 15 | -------------------------------------------------------------------------------- /sideband.h: -------------------------------------------------------------------------------- 1 | #ifndef SIDEBAND_H 2 | #define SIDEBAND_H 3 | 4 | #define SIDEBAND_PROTOCOL_ERROR -2 5 | #define SIDEBAND_REMOTE_ERROR -1 6 | 7 | int recv_sideband(const char *me, int in_stream, int out); 8 | ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max); 9 | 10 | #endif 11 | -------------------------------------------------------------------------------- /t/t4100/t-apply-8.patch: -------------------------------------------------------------------------------- 1 | diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh 2 | index be837bb..0798c64 100755 3 | --- a/t/t4100-apply-stat.sh 4 | +++ b/t/t4100-apply-stat.sh 5 | @@ -35,4 +35,4 @@ non git (2) 6 | non git (3) 7 | EOF 8 | 9 | -test_done 10 | +test_done 11 | \ No newline at end of file 12 | -------------------------------------------------------------------------------- /t/t4100/t-apply-9.patch: -------------------------------------------------------------------------------- 1 | diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh 2 | index 0798c64..be837bb 100755 3 | --- a/t/t4100-apply-stat.sh 4 | +++ b/t/t4100-apply-stat.sh 5 | @@ -35,4 +35,4 @@ non git (2) 6 | non git (3) 7 | EOF 8 | 9 | -test_done 10 | \ No newline at end of file 11 | +test_done 12 | -------------------------------------------------------------------------------- /compat/strlcpy.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | size_t gitstrlcpy(char *dest, const char *src, size_t size) 4 | { 5 | size_t ret = strlen(src); 6 | 7 | if (size) { 8 | size_t len = (ret >= size) ? size - 1 : ret; 9 | memcpy(dest, src, len); 10 | dest[len] = '\0'; 11 | } 12 | return ret; 13 | } 14 | -------------------------------------------------------------------------------- /mailmap.h: -------------------------------------------------------------------------------- 1 | #ifndef MAILMAP_H 2 | #define MAILMAP_H 3 | 4 | int read_mailmap(struct string_list *map, char **repo_abbrev); 5 | void clear_mailmap(struct string_list *map); 6 | 7 | int map_user(struct string_list *map, 8 | const char **email, size_t *emaillen, const char **name, size_t *namelen); 9 | 10 | #endif 11 | -------------------------------------------------------------------------------- /t/t4034/perl/pre: -------------------------------------------------------------------------------- 1 | #!/usr/bin/perl 2 | 3 | use strict; 4 | 5 | package Frotz; 6 | sub new { 7 | my $class = shift; 8 | return bless {}, $class; 9 | } 10 | 11 | __END__ 12 | =head1 NAME 13 | 14 | frotz - Frotz 15 | 16 | =head1 SYNOPSIS 17 | 18 | use frotz; 19 | 20 | $nitfol = new Frotz(); 21 | 22 | =cut 23 | -------------------------------------------------------------------------------- /t/t4034/python/pre: -------------------------------------------------------------------------------- 1 | print u"Hello World!\n" 2 | 1 -1e10 0xabcdef 'x' 3 | [a] a->b a.b 4 | !a ~a a++ a-- a*b a&b 5 | a*b a/b a%b 6 | a+b a-b 7 | a<>b 8 | ab a>=b 9 | a==b a!=b 10 | a&b 11 | a^b 12 | a|b 13 | a&&b 14 | a||b 15 | a?b:z 16 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 17 | a,y 18 | -------------------------------------------------------------------------------- /t/t4034/ruby/pre: -------------------------------------------------------------------------------- 1 | 10.downto(1) {|x| puts x} 2 | 1 -1e10 0xabcdef 'x' 3 | [a] a->b a.b 4 | !a ~a a++ a-- a*b a&b 5 | a*b a/b a%b 6 | a+b a-b 7 | a<>b 8 | ab a>=b 9 | a==b a!=b 10 | a&b 11 | a^b 12 | a|b 13 | a&&b 14 | a||b 15 | a?b:z 16 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 17 | a,y 18 | -------------------------------------------------------------------------------- /t/t4135/damaged-tz.diff: -------------------------------------------------------------------------------- 1 | diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt 2 | --- linux-2.6.12-rc2-mm3-vanilla/post image.txt 1969-12-31 16:00:00 -08:00 3 | +++ linux-2.6.12-rc2-mm3/post image.txt 2005-04-12 02:14:06 -07:00 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /t/t4135/funny-tz.diff: -------------------------------------------------------------------------------- 1 | diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt 2 | --- linux-2.6.12-rc2-mm3-vanilla/post image.txt 1969-12-31 16:00:00 -08:00 3 | +++ linux-2.6.12-rc2-mm3/post image.txt 2005-04-12 02:14:06 -07:00 4 | @@ -0,0 +1 @@ 5 | +postimage 6 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.8.5.1.txt: -------------------------------------------------------------------------------- 1 | Git v1.8.5.1 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.8.5 5 | ------------------ 6 | 7 | * "git submodule init" copied "submodule.$name.update" settings from 8 | .gitmodules to .git/config without making sure if the suggested 9 | value was sensible. 10 | -------------------------------------------------------------------------------- /git-gui/po/glossary/Makefile: -------------------------------------------------------------------------------- 1 | PO_TEMPLATE = git-gui-glossary.pot 2 | 3 | ALL_POFILES = $(wildcard *.po) 4 | 5 | $(PO_TEMPLATE): $(subst .pot,.txt,$(PO_TEMPLATE)) 6 | ./txt-to-pot.sh $< > $@ 7 | 8 | update-po:: git-gui-glossary.pot 9 | $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) 10 | -------------------------------------------------------------------------------- /t/t4013/diff.show_--stat_side: -------------------------------------------------------------------------------- 1 | $ git show --stat side 2 | commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:03:00 2006 +0000 5 | 6 | Side 7 | 8 | dir/sub | 2 ++ 9 | file0 | 3 +++ 10 | file3 | 4 ++++ 11 | 3 files changed, 9 insertions(+) 12 | $ 13 | -------------------------------------------------------------------------------- /t/t4034/ruby/post: -------------------------------------------------------------------------------- 1 | 10.downto(1) {|y| puts y} 2 | (1) (-1e10) (0xabcdef) 'y' 3 | [x] x->y x.y 4 | !x ~x x++ x-- x*y x&y 5 | x*y x/y x%y 6 | x+y x-y 7 | x<>y 8 | xy x>=y 9 | x==y x!=y 10 | x&y 11 | x^y 12 | x|y 13 | x&&y 14 | x||y 15 | x?y:z 16 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 17 | x,y 18 | -------------------------------------------------------------------------------- /vcs-svn/svndump.h: -------------------------------------------------------------------------------- 1 | #ifndef SVNDUMP_H_ 2 | #define SVNDUMP_H_ 3 | 4 | int svndump_init(const char *filename); 5 | int svndump_init_fd(int in_fd, int back_fd); 6 | void svndump_read(const char *url, const char *local_ref, const char *notes_ref); 7 | void svndump_deinit(void); 8 | void svndump_reset(void); 9 | 10 | #endif 11 | -------------------------------------------------------------------------------- /t/t4034/pascal/pre: -------------------------------------------------------------------------------- 1 | writeln("Hello World!"); 2 | 1 -1e10 0xabcdef 'x' 3 | [a] a->b a.b 4 | !a ~a a++ a-- a*b a&b 5 | a*b a/b a%b 6 | a+b a-b 7 | a<>b 8 | ab a>=b 9 | a==b a!=b 10 | a&b 11 | a^b 12 | a|b 13 | a&&b 14 | a||b 15 | a?b:z 16 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 17 | a,y 18 | a::b 19 | -------------------------------------------------------------------------------- /t/t4034/php/pre: -------------------------------------------------------------------------------- 1 | $var $var 2 | 3 | 1 -1e10 0xabcdef 'x' 4 | [a] a->b a.b 5 | !a ~a a++ a-- a*b a&b 6 | a*b a/b a%b 7 | a+b a-b 8 | a<>b 9 | ab a>=b 10 | a==b a!=b 11 | a&b 12 | a^b 13 | a|b 14 | a&&b 15 | a||b 16 | a?b:z 17 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 18 | a,y 19 | -------------------------------------------------------------------------------- /t/t4100/t-apply-7.expect: -------------------------------------------------------------------------------- 1 | Documentation/git-ls-tree.txt | 20 +- 2 | ls-tree.c | 333 +++++++++++++++++++++++------------------ 3 | t/t3100-ls-tree-restrict.sh | 3 4 | tree.c | 2 5 | tree.h | 1 6 | 5 files changed, 199 insertions(+), 160 deletions(-) 7 | -------------------------------------------------------------------------------- /t/t4034/pascal/post: -------------------------------------------------------------------------------- 1 | writeln("Hello World?"); 2 | (1) (-1e10) (0xabcdef) 'y' 3 | [x] x->y x.y 4 | !x ~x x++ x-- x*y x&y 5 | x*y x/y x%y 6 | x+y x-y 7 | x<>y 8 | xy x>=y 9 | x==y x!=y 10 | x&y 11 | x^y 12 | x|y 13 | x&&y 14 | x||y 15 | x?y:z 16 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 17 | x,y 18 | x::y 19 | -------------------------------------------------------------------------------- /t/t4034/php/post: -------------------------------------------------------------------------------- 1 | ($var) $ var 2 | 3 | (1) (-1e10) (0xabcdef) 'y' 4 | [x] x->y x.y 5 | !x ~x x++ x-- x*y x&y 6 | x*y x/y x%y 7 | x+y x-y 8 | x<>y 9 | xy x>=y 10 | x==y x!=y 11 | x&y 12 | x^y 13 | x|y 14 | x&&y 15 | x||y 16 | x?y:z 17 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 18 | x,y 19 | -------------------------------------------------------------------------------- /t/t4034/python/post: -------------------------------------------------------------------------------- 1 | print "Hello World?\n"; print 2 | (1) (-1e10) (0xabcdef) u'y' 3 | [x] x->y x.y 4 | !x ~x x++ x-- x*y x&y 5 | x*y x/y x%y 6 | x+y x-y 7 | x<>y 8 | xy x>=y 9 | x==y x!=y 10 | x&y 11 | x^y 12 | x|y 13 | x&&y 14 | x||y 15 | x?y:z 16 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 17 | x,y 18 | -------------------------------------------------------------------------------- /test-index-version.c: -------------------------------------------------------------------------------- 1 | #include "cache.h" 2 | 3 | int main(int argc, char **argv) 4 | { 5 | struct cache_header hdr; 6 | int version; 7 | 8 | memset(&hdr,0,sizeof(hdr)); 9 | if (read(0, &hdr, sizeof(hdr)) != sizeof(hdr)) 10 | return 0; 11 | version = ntohl(hdr.hdr_version); 12 | printf("%d\n", version); 13 | return 0; 14 | } 15 | -------------------------------------------------------------------------------- /test-mktemp.c: -------------------------------------------------------------------------------- 1 | /* 2 | * test-mktemp.c: code to exercise the creation of temporary files 3 | */ 4 | #include "git-compat-util.h" 5 | 6 | int main(int argc, char *argv[]) 7 | { 8 | if (argc != 2) 9 | usage("Expected 1 parameter defining the temporary file template"); 10 | 11 | xmkstemp(xstrdup(argv[1])); 12 | 13 | return 0; 14 | } 15 | -------------------------------------------------------------------------------- /t/t4034/csharp/pre: -------------------------------------------------------------------------------- 1 | Foo():x(0&&1){} 2 | cout<<"Hello World!\n"<b a.b 5 | !a ~a a++ a-- a*b a&b 6 | a*b a/b a%b 7 | a+b a-b 8 | a<>b 9 | ab a>=b 10 | a==b a!=b 11 | a&b 12 | a^b 13 | a|b 14 | a&&b 15 | a||b 16 | a?b:z 17 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 18 | a,y 19 | -------------------------------------------------------------------------------- /t/t4034/objc/pre: -------------------------------------------------------------------------------- 1 | Foo():x(0&&1){} 2 | cout<<"Hello World!\n"<b a.b 5 | !a ~a a++ a-- a*b a&b 6 | a*b a/b a%b 7 | a+b a-b 8 | a<>b 9 | ab a>=b 10 | a==b a!=b 11 | a&b 12 | a^b 13 | a|b 14 | a&&b 15 | a||b 16 | a?b:z 17 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 18 | a,y 19 | -------------------------------------------------------------------------------- /t/t4034/perl/post: -------------------------------------------------------------------------------- 1 | #!/usr/bin/perl 2 | 3 | use strict; 4 | 5 | package Frotz; 6 | sub new { 7 | my ($class, %opts) = @_; 8 | return bless { xyzzy => "nitfol", %opts }, $class; 9 | } 10 | 11 | __END__ 12 | =head1 NAME 13 | 14 | frotz - Frotz 15 | 16 | =head1 SYNOPSIS 17 | 18 | use frotz; 19 | 20 | $nitfol = new Frotz(); 21 | 22 | =cut 23 | -------------------------------------------------------------------------------- /t/t4034/cpp/pre: -------------------------------------------------------------------------------- 1 | Foo():x(0&&1){} 2 | cout<<"Hello World!\n"<b a.b 5 | !a ~a a++ a-- a*b a&b 6 | a*b a/b a%b 7 | a+b a-b 8 | a<>b 9 | ab a>=b 10 | a==b a!=b 11 | a&b 12 | a^b 13 | a|b 14 | a&&b 15 | a||b 16 | a?b:z 17 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 18 | a,y 19 | a::b 20 | -------------------------------------------------------------------------------- /t/t4034/java/pre: -------------------------------------------------------------------------------- 1 | Foo():x(0&&1){} 2 | cout<<"Hello World!\n"<b a.b 5 | !a ~a a++ a-- a*b a&b 6 | a*b a/b a%b 7 | a+b a-b 8 | a<>b 9 | ab a>=b 10 | a==b a!=b 11 | a&b 12 | a^b 13 | a|b 14 | a&&b 15 | a||b 16 | a?b:z 17 | a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b 18 | a,y 19 | a::b 20 | -------------------------------------------------------------------------------- /t/Git-SVN/00compile.t: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env perl 2 | 3 | use strict; 4 | use warnings; 5 | 6 | use Test::More tests => 7; 7 | 8 | require_ok 'Git::SVN'; 9 | require_ok 'Git::SVN::Utils'; 10 | require_ok 'Git::SVN::Ra'; 11 | require_ok 'Git::SVN::Log'; 12 | require_ok 'Git::SVN::Migration'; 13 | require_ok 'Git::IndexInfo'; 14 | require_ok 'Git::SVN::GlobSpec'; 15 | -------------------------------------------------------------------------------- /t/t4100/t-apply-3.expect: -------------------------------------------------------------------------------- 1 | Documentation/git-ls-tree.txt | 20 +- 2 | ls-tree.c | 459 ++++++++++++++++++++++------------------- 3 | t/t3100-ls-tree-restrict.sh | 3 4 | tree.c | 2 5 | tree.h | 1 6 | 5 files changed, 262 insertions(+), 223 deletions(-) 7 | rewrite ls-tree.c (82%) 8 | -------------------------------------------------------------------------------- /contrib/mw-to-git/git-remote-mediawiki.txt: -------------------------------------------------------------------------------- 1 | Git-Mediawiki is a project which aims the creation of a gate 2 | between git and mediawiki, allowing git users to push and pull 3 | objects from mediawiki just as one would do with a classic git 4 | repository thanks to remote-helpers. 5 | 6 | For more information, visit the wiki at 7 | https://github.com/moy/Git-Mediawiki/wiki 8 | -------------------------------------------------------------------------------- /t/t4034/csharp/post: -------------------------------------------------------------------------------- 1 | Foo() : x(0&42) { bar(x); } 2 | cout<<"Hello World?\n"<y x.y 5 | !x ~x x++ x-- x*y x&y 6 | x*y x/y x%y 7 | x+y x-y 8 | x<>y 9 | xy x>=y 10 | x==y x!=y 11 | x&y 12 | x^y 13 | x|y 14 | x&&y 15 | x||y 16 | x?y:z 17 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 18 | x,y 19 | -------------------------------------------------------------------------------- /t/t4034/objc/post: -------------------------------------------------------------------------------- 1 | Foo() : x(0&42) { bar(x); } 2 | cout<<"Hello World?\n"<y x.y 5 | !x ~x x++ x-- x*y x&y 6 | x*y x/y x%y 7 | x+y x-y 8 | x<>y 9 | xy x>=y 10 | x==y x!=y 11 | x&y 12 | x^y 13 | x|y 14 | x&&y 15 | x||y 16 | x?y:z 17 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 18 | x,y 19 | -------------------------------------------------------------------------------- /t/t4109/expect-2: -------------------------------------------------------------------------------- 1 | #include 2 | 3 | int func(int num); 4 | void print_int(int num); 5 | 6 | int main() { 7 | int i; 8 | 9 | for (i = 0; i < 10; i++) { 10 | print_int(func(i)); 11 | } 12 | 13 | return 0; 14 | } 15 | 16 | int func(int num) { 17 | return num * num; 18 | } 19 | 20 | void print_int(int num) { 21 | printf("%d", num); 22 | } 23 | 24 | -------------------------------------------------------------------------------- /t/t5515/refs.master_.._.git: -------------------------------------------------------------------------------- 1 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master 3 | 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one 4 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three 5 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two 6 | -------------------------------------------------------------------------------- /mergetools/diffmerge: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 3 | } 4 | 5 | merge_cmd () { 6 | if $base_present 7 | then 8 | "$merge_tool_path" --merge --result="$MERGED" \ 9 | "$LOCAL" "$BASE" "$REMOTE" 10 | else 11 | "$merge_tool_path" --merge \ 12 | --result="$MERGED" "$LOCAL" "$REMOTE" 13 | fi 14 | status=$? 15 | } 16 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--root_--summary_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --root --summary initial 2 | commit 444ac553ac7612cc88969031b02b3767fb8a353a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:00:00 2006 +0000 5 | 6 | Initial 7 | 8 | create mode 100644 dir/sub 9 | create mode 100644 file0 10 | create mode 100644 file2 11 | $ 12 | -------------------------------------------------------------------------------- /t/t4034/cpp/post: -------------------------------------------------------------------------------- 1 | Foo() : x(0&42) { bar(x); } 2 | cout<<"Hello World?\n"<y x.y 5 | !x ~x x++ x-- x*y x&y 6 | x*y x/y x%y 7 | x+y x-y 8 | x<>y 9 | xy x>=y 10 | x==y x!=y 11 | x&y 12 | x^y 13 | x|y 14 | x&&y 15 | x||y 16 | x?y:z 17 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 18 | x,y 19 | x::y 20 | -------------------------------------------------------------------------------- /t/t4252/am-test-5-2: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Six 4 | 5 | Applying this patch with --directory='frotz nitfol' should succeed 6 | 7 | diff --git i/file-5 w/file-5 8 | new file mode 100644 9 | index 000000..1d6ed9f 10 | --- /dev/null 11 | +++ w/file-5 12 | @@ -0,0 +1,3 @@ 13 | +One 14 | +two 15 | +three 16 | -------------------------------------------------------------------------------- /t/t5515/refs.br-unconfig_.._.git: -------------------------------------------------------------------------------- 1 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master 3 | 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one 4 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three 5 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two 6 | -------------------------------------------------------------------------------- /t/t5515/refs.master_.._.git_one: -------------------------------------------------------------------------------- 1 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master 3 | 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one 4 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three 5 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two 6 | -------------------------------------------------------------------------------- /contrib/credential/wincred/Makefile: -------------------------------------------------------------------------------- 1 | all: git-credential-wincred.exe 2 | 3 | CC = gcc 4 | RM = rm -f 5 | CFLAGS = -O2 -Wall 6 | 7 | -include ../../../config.mak.autogen 8 | -include ../../../config.mak 9 | 10 | git-credential-wincred.exe : git-credential-wincred.c 11 | $(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@ 12 | 13 | clean: 14 | $(RM) git-credential-wincred.exe 15 | -------------------------------------------------------------------------------- /mergetools/diffuse: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" | cat 3 | } 4 | 5 | merge_cmd () { 6 | touch "$BACKUP" 7 | if $base_present 8 | then 9 | "$merge_tool_path" \ 10 | "$LOCAL" "$MERGED" "$REMOTE" \ 11 | "$BASE" | cat 12 | else 13 | "$merge_tool_path" \ 14 | "$LOCAL" "$MERGED" "$REMOTE" | cat 15 | fi 16 | check_unchanged 17 | } 18 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--root_--stat_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --root --stat initial 2 | commit 444ac553ac7612cc88969031b02b3767fb8a353a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:00:00 2006 +0000 5 | 6 | Initial 7 | 8 | dir/sub | 2 ++ 9 | file0 | 3 +++ 10 | file2 | 3 +++ 11 | 3 files changed, 8 insertions(+) 12 | $ 13 | -------------------------------------------------------------------------------- /t/t4013/diff.show_--stat_--summary_side: -------------------------------------------------------------------------------- 1 | $ git show --stat --summary side 2 | commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:03:00 2006 +0000 5 | 6 | Side 7 | 8 | dir/sub | 2 ++ 9 | file0 | 3 +++ 10 | file3 | 4 ++++ 11 | 3 files changed, 9 insertions(+) 12 | create mode 100644 file3 13 | $ 14 | -------------------------------------------------------------------------------- /t/t4034/bibtex/pre: -------------------------------------------------------------------------------- 1 | @article{aldous1987uie, 2 | title={{Ultimate instability of exponential back-off protocol for acknowledgment-based transmission control of random access communication channels}}, 3 | author={Aldous, D.}, 4 | journal={Information Theory, IEEE Transactions on}, 5 | volume={33}, 6 | number={2}, 7 | pages={219--223}, 8 | year={1987}, 9 | } 10 | -------------------------------------------------------------------------------- /t/t4034/java/post: -------------------------------------------------------------------------------- 1 | Foo() : x(0&42) { bar(x); } 2 | cout<<"Hello World?\n"<y x.y 5 | !x ~x x++ x-- x*y x&y 6 | x*y x/y x%y 7 | x+y x-y 8 | x<>y 9 | xy x>=y 10 | x==y x!=y 11 | x&y 12 | x^y 13 | x|y 14 | x&&y 15 | x||y 16 | x?y:z 17 | x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y 18 | x,y 19 | x::y 20 | -------------------------------------------------------------------------------- /t/t5515/refs.br-unconfig_.._.git_one: -------------------------------------------------------------------------------- 1 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master 3 | 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one 4 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three 5 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two 6 | -------------------------------------------------------------------------------- /t/t5515/refs.master_.._.git_one_two: -------------------------------------------------------------------------------- 1 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master 3 | 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one 4 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three 5 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two 6 | -------------------------------------------------------------------------------- /contrib/remote-helpers/Makefile: -------------------------------------------------------------------------------- 1 | TESTS := $(wildcard test*.sh) 2 | 3 | export T := $(addprefix $(CURDIR)/,$(TESTS)) 4 | export MAKE := $(MAKE) -e 5 | export PATH := $(CURDIR):$(PATH) 6 | export TEST_LINT := test-lint-executable test-lint-shell-syntax 7 | 8 | test: 9 | $(MAKE) -C ../../t $@ 10 | 11 | $(TESTS): 12 | $(MAKE) -C ../../t $(CURDIR)/$@ 13 | 14 | .PHONY: $(TESTS) 15 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --root --summary -r initial 2 | commit 444ac553ac7612cc88969031b02b3767fb8a353a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:00:00 2006 +0000 5 | 6 | Initial 7 | 8 | create mode 100644 dir/sub 9 | create mode 100644 file0 10 | create mode 100644 file2 11 | $ 12 | -------------------------------------------------------------------------------- /t/t4252/am-test-6-1: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Huh 4 | 5 | Should fail and leave rejects 6 | 7 | diff --git i/file-2 w/file-2 8 | index 06e567b..b6f3a16 100644 9 | --- i/file-2 10 | +++ w/file-2 11 | @@ -1,3 +1,3 @@ 12 | -0 13 | +One 14 | 2 15 | 3 16 | @@ -4,4 +4,4 @@ 17 | 4 18 | 5 19 | -6 20 | +Six 21 | 7 22 | -------------------------------------------------------------------------------- /t/t5515/refs.br-unconfig_.._.git_one_two: -------------------------------------------------------------------------------- 1 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master 3 | 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one 4 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three 5 | 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two 6 | -------------------------------------------------------------------------------- /t/lib-pager.sh: -------------------------------------------------------------------------------- 1 | # Helpers for tests of git's choice of pager. 2 | 3 | test_expect_success 'determine default pager' ' 4 | test_might_fail git config --unset core.pager && 5 | less=$( 6 | unset PAGER GIT_PAGER; 7 | git var GIT_PAGER 8 | ) && 9 | test -n "$less" 10 | ' 11 | 12 | if expr "$less" : '[a-z][a-z]*$' >/dev/null 13 | then 14 | test_set_prereq SIMPLEPAGER 15 | fi 16 | -------------------------------------------------------------------------------- /t/t4034/fortran/expect: -------------------------------------------------------------------------------- 1 | diff --git a/pre b/post 2 | index 87f0d0b..d308da2 100644 3 | --- a/pre 4 | +++ b/post 5 | @@ -1,5 +1,5 @@ 6 | print *, "Hello World!?" 7 | 8 | DO10I = 1,10 9 | DO10IDO 10 I = 1,10 10 | DO10IDO 1 0 I = 1,10 11 | -------------------------------------------------------------------------------- /t/t9136-git-svn-recreated-branch-empty-file.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='test recreated svn branch with empty files' 4 | 5 | . ./lib-git-svn.sh 6 | test_expect_success 'load svn dumpfile' ' 7 | svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9136/svn.dump" 8 | ' 9 | 10 | test_expect_success 'clone using git svn' 'git svn clone -s "$svnrepo" x' 11 | 12 | test_done 13 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.5.3.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.5.3 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.5.5.2 5 | -------------------- 6 | 7 | * "git send-email --compose" did not notice that non-ascii contents 8 | needed some MIME magic. 9 | 10 | * "git fast-export" did not export octopus merges correctly. 11 | 12 | Also comes with various documentation updates. 13 | -------------------------------------------------------------------------------- /mergetools/opendiff: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" | cat 3 | } 4 | 5 | merge_cmd () { 6 | touch "$BACKUP" 7 | if $base_present 8 | then 9 | "$merge_tool_path" "$LOCAL" "$REMOTE" \ 10 | -ancestor "$BASE" -merge "$MERGED" | cat 11 | else 12 | "$merge_tool_path" "$LOCAL" "$REMOTE" \ 13 | -merge "$MERGED" | cat 14 | fi 15 | check_unchanged 16 | } 17 | -------------------------------------------------------------------------------- /Documentation/manpage-base-url.xsl.in: -------------------------------------------------------------------------------- 1 | 3 | 5 | 6 | 7 | @@MAN_BASE_URL@@ 9 | 10 | 11 | -------------------------------------------------------------------------------- /contrib/git-shell-commands/help: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | if tty -s 4 | then 5 | echo "Run 'help' for help, or 'exit' to leave. Available commands:" 6 | else 7 | echo "Run 'help' for help. Available commands:" 8 | fi 9 | 10 | cd "$(dirname "$0")" 11 | 12 | for cmd in * 13 | do 14 | case "$cmd" in 15 | help) ;; 16 | *) [ -f "$cmd" ] && [ -x "$cmd" ] && echo "$cmd" ;; 17 | esac 18 | done 19 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-GF_-p_master: -------------------------------------------------------------------------------- 1 | $ git log -GF -p master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | 8 | diff --git a/dir/sub b/dir/sub 9 | index 8422d40..cead32e 100644 10 | --- a/dir/sub 11 | +++ b/dir/sub 12 | @@ -2,3 +2,5 @@ A 13 | B 14 | C 15 | D 16 | +E 17 | +F 18 | $ 19 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-SF_-p_master: -------------------------------------------------------------------------------- 1 | $ git log -SF -p master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | 8 | diff --git a/dir/sub b/dir/sub 9 | index 8422d40..cead32e 100644 10 | --- a/dir/sub 11 | +++ b/dir/sub 12 | @@ -2,3 +2,5 @@ A 13 | B 14 | C 15 | D 16 | +E 17 | +F 18 | $ 19 | -------------------------------------------------------------------------------- /t/t4034/tex/expect: -------------------------------------------------------------------------------- 1 | diff --git a/pre b/post 2 | index 2b2dfcb..65cab61 100644 3 | --- a/pre 4 | +++ b/post 5 | @@ -1,4 +1,4 @@ 6 | \section{Something new} 7 | \emph\textbf{Macro style} 8 | {\em\bfseries State toggle style} 9 | \\[1em1cm] 10 | -------------------------------------------------------------------------------- /t/t4109/expect-3: -------------------------------------------------------------------------------- 1 | #include 2 | 3 | int func(int num); 4 | int func2(int num); 5 | 6 | int main() { 7 | int i; 8 | 9 | for (i = 0; i < 10; i++) { 10 | printf("%d", func(i)); 11 | printf("%d", func3(i)); 12 | } 13 | 14 | return 0; 15 | } 16 | 17 | int func(int num) { 18 | return num * num; 19 | } 20 | 21 | int func2(int num) { 22 | return num * num * num; 23 | } 24 | 25 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.3.1.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.3.1 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.5.3 5 | ------------------ 6 | 7 | This is solely to fix the generated RPM's dependencies. We used 8 | to have git-p4 package but we do not anymore. As suggested on 9 | the mailing list, this release makes git-core "Obsolete" git-p4, 10 | so that yum update would not complain. 11 | -------------------------------------------------------------------------------- /Documentation/fix-texi.perl: -------------------------------------------------------------------------------- 1 | #!/usr/bin/perl -w 2 | 3 | while (<>) { 4 | if (/^\@setfilename/) { 5 | $_ = "\@setfilename git.info\n"; 6 | } elsif (/^\@direntry/) { 7 | print '@dircategory Development 8 | @direntry 9 | * Git: (git). A fast distributed revision control system 10 | @end direntry 11 | '; } 12 | unless (/^\@direntry/../^\@end direntry/) { 13 | print; 14 | } 15 | } 16 | -------------------------------------------------------------------------------- /Documentation/docbook.xsl: -------------------------------------------------------------------------------- 1 | 3 | 4 | 8 | 9 | -------------------------------------------------------------------------------- /t/t4013/diff.whatchanged_-SF_-p_master: -------------------------------------------------------------------------------- 1 | $ git whatchanged -SF -p master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | 8 | diff --git a/dir/sub b/dir/sub 9 | index 8422d40..cead32e 100644 10 | --- a/dir/sub 11 | +++ b/dir/sub 12 | @@ -2,3 +2,5 @@ A 13 | B 14 | C 15 | D 16 | +E 17 | +F 18 | $ 19 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.4.7.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.4.7 Release Notes 2 | ========================== 3 | 4 | Fixes since 1.5.4.7 5 | ------------------- 6 | 7 | * Removed support for an obsolete gitweb request URI, whose 8 | implementation ran "git diff" Porcelain, instead of using plumbing, 9 | which would have run an external diff command specified in the 10 | repository configuration as the gitweb user. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.5.6.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.5.6 Release Notes 2 | ========================== 3 | 4 | Fixes since 1.5.5.5 5 | ------------------- 6 | 7 | * Removed support for an obsolete gitweb request URI, whose 8 | implementation ran "git diff" Porcelain, instead of using plumbing, 9 | which would have run an external diff command specified in the 10 | repository configuration as the gitweb user. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.6.6.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.6.6 Release Notes 2 | ========================== 3 | 4 | Fixes since 1.5.6.5 5 | ------------------- 6 | 7 | * Removed support for an obsolete gitweb request URI, whose 8 | implementation ran "git diff" Porcelain, instead of using plumbing, 9 | which would have run an external diff command specified in the 10 | repository configuration as the gitweb user. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.6.3.1.txt: -------------------------------------------------------------------------------- 1 | GIT v1.6.3.1 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.6.3 5 | ------------------ 6 | 7 | * "git checkout -b new-branch" with a staged change in the index 8 | incorrectly primed the in-index cache-tree, resulting a wrong tree 9 | object to be written out of the index. This is a grave regression 10 | since the last 1.6.2.X maintenance release. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.8.1.4.txt: -------------------------------------------------------------------------------- 1 | Git 1.8.1.4 Release Notes 2 | ========================= 3 | 4 | Fixes since v1.8.1.3 5 | -------------------- 6 | 7 | * "git imap-send" talking over imaps:// did make sure it received a 8 | valid certificate from the other end, but did not check if the 9 | certificate matched the host it thought it was talking to. 10 | 11 | Also contains various documentation fixes. 12 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.8.4.4.txt: -------------------------------------------------------------------------------- 1 | Git v1.8.4.4 Release Notes 2 | ======================== 3 | 4 | Fixes since v1.8.4.3 5 | -------------------- 6 | 7 | * The fix in v1.8.4.3 to the pack transfer protocol to propagate 8 | the target of symbolic refs broke "git clone/git fetch" from a 9 | repository with too many symbolic refs. As a hotfix/workaround, 10 | we transfer only the information on HEAD. 11 | -------------------------------------------------------------------------------- /compat/basename.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | /* Adapted from libiberty's basename.c. */ 4 | char *gitbasename (char *path) 5 | { 6 | const char *base; 7 | /* Skip over the disk name in MSDOS pathnames. */ 8 | if (has_dos_drive_prefix(path)) 9 | path += 2; 10 | for (base = path; *path; path++) { 11 | if (is_dir_sep(*path)) 12 | base = path + 1; 13 | } 14 | return (char *)base; 15 | } 16 | -------------------------------------------------------------------------------- /t/t4252/am-test-1-1: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Three 4 | 5 | Application of this should be rejected because the first line in the 6 | context does not match. 7 | 8 | diff --git i/file-1 w/file-1 9 | index 06e567b..10f8342 100644 10 | --- i/file-1 11 | +++ w/file-1 12 | @@ -1,6 +1,6 @@ 13 | One 14 | 2 15 | -3 16 | +Three 17 | 4 18 | 5 19 | 6 20 | -------------------------------------------------------------------------------- /t/t4252/am-test-5-1: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Six 4 | 5 | Applying this patch with --directory='frotz nitfol' should fail 6 | 7 | diff --git i/junk/file-2 w/junk/file-2 8 | index 06e567b..b6f3a16 100644 9 | --- i/junk/file-2 10 | +++ w/junk/file-2 11 | @@ -1,7 +1,7 @@ 12 | One 13 | 2 14 | -3 15 | +Three 16 | 4 17 | 5 18 | -6 19 | +Six 20 | 7 21 | -------------------------------------------------------------------------------- /contrib/mw-to-git/t/t9364-pull-by-rev.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='Test the Git Mediawiki remote helper: git pull by revision' 4 | 5 | . ./test-gitmw-lib.sh 6 | . ./push-pull-tests.sh 7 | . $TEST_DIRECTORY/test-lib.sh 8 | 9 | test_check_precond 10 | 11 | test_expect_success 'configuration' ' 12 | git config --global mediawiki.fetchStrategy by_rev 13 | ' 14 | 15 | test_push_pull 16 | 17 | test_done 18 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_-c_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree -c master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub 4 | ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0 5 | $ 6 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.7.7.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.7.7 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.7.6 5 | -------------------- 6 | 7 | * An error message from 'git bundle' had an unmatched single quote pair in it. 8 | 9 | * 'git diff --histogram' option was not described. 10 | 11 | * 'git imap-send' carried an unused dead code. 12 | 13 | Also contains minor fixes and documentation updates. 14 | -------------------------------------------------------------------------------- /bulk-checkin.h: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2011, Google Inc. 3 | */ 4 | #ifndef BULK_CHECKIN_H 5 | #define BULK_CHECKIN_H 6 | 7 | #include "cache.h" 8 | 9 | extern int index_bulk_checkin(unsigned char sha1[], 10 | int fd, size_t size, enum object_type type, 11 | const char *path, unsigned flags); 12 | 13 | extern void plug_bulk_checkin(void); 14 | extern void unplug_bulk_checkin(void); 15 | 16 | #endif 17 | -------------------------------------------------------------------------------- /contrib/credential/netrc/test.netrc: -------------------------------------------------------------------------------- 1 | machine imap login tzz@lifelogs.com port imaps password letmeknow 2 | machine imap login bob port imaps password bobwillknow 3 | 4 | # comment test 5 | 6 | machine imap2 login tzz port 1099 password tzzknow 7 | machine imap2 login bob password bobwillknow 8 | 9 | # another command 10 | 11 | machine github.com 12 | multilinetoken anothervalue 13 | login carol password carolknows 14 | -------------------------------------------------------------------------------- /t/lib-httpd/broken-smart-http.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | printf "Content-Type: text/%s\n" "html" 3 | echo 4 | printf "%s\n" "001e# service=git-upload-pack" 5 | printf "%s" "0000" 6 | printf "%s%c%s%s\n" \ 7 | "00a58681d9f286a48b08f37b3a095330da16689e3693 HEAD" \ 8 | 0 \ 9 | " include-tag multi_ack_detailed multi_ack ofs-delta" \ 10 | " side-band side-band-64k thin-pack no-progress shallow no-done " 11 | printf "%s" "0000" 12 | -------------------------------------------------------------------------------- /t/t8001-annotate.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='git annotate' 4 | . ./test-lib.sh 5 | 6 | PROG='git annotate' 7 | . "$TEST_DIRECTORY"/annotate-tests.sh 8 | 9 | test_expect_success 'annotate old revision' ' 10 | git annotate file master >actual && 11 | awk "{ print \$3; }" authors && 12 | test 2 = $(grep A 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Six 4 | 5 | Applying this patch with --whitespace=fix should lose 6 | the trailing whitespace after "Six". 7 | 8 | diff --git i/file-2 w/file-2 9 | index 06e567b..b6f3a16 100644 10 | --- i/file-2 11 | +++ w/file-2 12 | @@ -1,7 +1,7 @@ 13 | 1 14 | 2 15 | -3 16 | +Three 17 | 4 18 | 5 19 | -6 20 | +Six 21 | 7 22 | -------------------------------------------------------------------------------- /check_bindir: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | bindir="$1" 3 | gitexecdir="$2" 4 | gitcmd="$3" 5 | if test "$bindir" != "$gitexecdir" -a -x "$gitcmd" 6 | then 7 | echo 8 | echo "!! You have installed git-* commands to new gitexecdir." 9 | echo "!! Old version git-* commands still remain in bindir." 10 | echo "!! Mixing two versions of Git will lead to problems." 11 | echo "!! Please remove old version commands in bindir now." 12 | echo 13 | fi 14 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--root_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --root initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a 3 | :000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir 4 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 5 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4252/am-test-2-1: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Three 4 | 5 | Application of this should be rejected even with -C1 because the 6 | preimage line in the context does not match. 7 | 8 | diff --git i/file-1 w/file-1 9 | index 06e567b..10f8342 100644 10 | --- i/file-1 11 | +++ w/file-1 12 | @@ -1,6 +1,6 @@ 13 | 1 14 | 2 15 | -Tres 16 | +Three 17 | 4 18 | 5 19 | 6 20 | -------------------------------------------------------------------------------- /wildmatch.h: -------------------------------------------------------------------------------- 1 | #ifndef WILDMATCH_H 2 | #define WILDMATCH_H 3 | 4 | #define WM_CASEFOLD 1 5 | #define WM_PATHNAME 2 6 | 7 | #define WM_ABORT_MALFORMED 2 8 | #define WM_NOMATCH 1 9 | #define WM_MATCH 0 10 | #define WM_ABORT_ALL -1 11 | #define WM_ABORT_TO_STARSTAR -2 12 | 13 | struct wildopts; 14 | 15 | int wildmatch(const char *pattern, const char *text, 16 | unsigned int flags, 17 | struct wildopts *wo); 18 | #endif 19 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--root_-r_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --root -r initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a 3 | :000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub 4 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 5 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 6 | $ 7 | -------------------------------------------------------------------------------- /t/t4034/perl/expect: -------------------------------------------------------------------------------- 1 | diff --git a/pre b/post 2 | index f6610d3..e8b72ef 100644 3 | --- a/pre 4 | +++ b/post 5 | @@ -4,8 +4,8 @@ 6 | 7 | package Frotz; 8 | sub new { 9 | my ($class, %opts) = shift@_; 10 | return bless { xyzzy => "nitfol", %opts }, $class; 11 | } 12 | 13 | __END__ 14 | -------------------------------------------------------------------------------- /t/t4252/am-test-2-2: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Six 4 | 5 | Applying this patch with -C1 should be successful even though 6 | the first line in the context does not match. 7 | 8 | diff --git i/file-2 w/file-2 9 | index 06e567b..b6f3a16 100644 10 | --- i/file-2 11 | +++ w/file-2 12 | @@ -1,7 +1,7 @@ 13 | One 14 | 2 15 | -3 16 | +Three 17 | 4 18 | 5 19 | -6 20 | +Six 21 | 7 22 | -------------------------------------------------------------------------------- /Documentation/technical/api-object-access.txt: -------------------------------------------------------------------------------- 1 | object access API 2 | ================= 3 | 4 | Talk about and family, things like 5 | 6 | * read_sha1_file() 7 | * read_object_with_reference() 8 | * has_sha1_file() 9 | * write_sha1_file() 10 | * pretend_sha1_file() 11 | * lookup_{object,commit,tag,blob,tree} 12 | * parse_{object,commit,tag,blob,tree} 13 | * Use of object flags 14 | 15 | (JC, Shawn, Daniel, Dscho, Linus) 16 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.0.6.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.0.6 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.0.5 5 | -------------------- 6 | 7 | * "git diff --stat" used "int" to count the size of differences, 8 | which could result in overflowing. 9 | 10 | * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike 11 | newer tools in the git toolset. 12 | 13 | And other minor fixes and documentation updates. 14 | -------------------------------------------------------------------------------- /t/t4252/am-test-3-1: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Three 4 | 5 | Application of this should be rejected even with -p2 because the 6 | preimage line in the context does not match. 7 | 8 | diff --git i/junk/file-1 w/junk/file-1 9 | index 06e567b..10f8342 100644 10 | --- i/junk/file-1 11 | +++ w/junk/file-1 12 | @@ -1,6 +1,6 @@ 13 | 1 14 | 2 15 | -Tres 16 | +Three 17 | 4 18 | 5 19 | 6 20 | -------------------------------------------------------------------------------- /t/t4252/am-test-3-2: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Six 4 | 5 | Applying this patch with -p2 should be successful even though 6 | the patch is against a wrong level. 7 | 8 | diff --git i/junk/file-2 w/junk/file-2 9 | index 06e567b..b6f3a16 100644 10 | --- i/junk/file-2 11 | +++ w/junk/file-2 12 | @@ -1,7 +1,7 @@ 13 | 1 14 | 2 15 | -3 16 | +Three 17 | 4 18 | 5 19 | -6 20 | +Six 21 | 7 22 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.9.7.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.9.7 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.9.6 5 | -------------------- 6 | 7 | * An error message from 'git bundle' had an unmatched single quote pair in it. 8 | 9 | * The way 'git fetch' implemented its connectivity check over 10 | received objects was overly pessimistic, and wasted a lot of 11 | cycles. 12 | 13 | Also contains minor fixes and documentation updates. 14 | -------------------------------------------------------------------------------- /t/t4252/am-test-4-1: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Three 4 | 5 | Application of this should be rejected even with -C1 -p2 because 6 | the preimage line in the context does not match. 7 | 8 | diff --git i/junk/file-1 w/junk/file-1 9 | index 06e567b..10f8342 100644 10 | --- i/junk/file-1 11 | +++ w/junk/file-1 12 | @@ -1,6 +1,6 @@ 13 | 1 14 | 2 15 | -Tres 16 | +Three 17 | 4 18 | 5 19 | 6 20 | -------------------------------------------------------------------------------- /test-sigchain.c: -------------------------------------------------------------------------------- 1 | #include "sigchain.h" 2 | #include "cache.h" 3 | 4 | #define X(f) \ 5 | static void f(int sig) { \ 6 | puts(#f); \ 7 | fflush(stdout); \ 8 | sigchain_pop(sig); \ 9 | raise(sig); \ 10 | } 11 | X(one) 12 | X(two) 13 | X(three) 14 | #undef X 15 | 16 | int main(int argc, char **argv) { 17 | sigchain_push(SIGTERM, one); 18 | sigchain_push(SIGTERM, two); 19 | sigchain_push(SIGTERM, three); 20 | raise(SIGTERM); 21 | return 0; 22 | } 23 | -------------------------------------------------------------------------------- /contrib/examples/git-log.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # 3 | # Copyright (c) 2005 Linus Torvalds 4 | # 5 | 6 | USAGE='[--max-count=] [..] [--pretty=] [git-rev-list options]' 7 | SUBDIRECTORY_OK='Yes' 8 | . git-sh-setup 9 | 10 | revs=$(git-rev-parse --revs-only --no-flags --default HEAD "$@") || exit 11 | [ "$revs" ] || { 12 | die "No HEAD ref" 13 | } 14 | git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | 15 | LESS=-S ${PAGER:-less} 16 | -------------------------------------------------------------------------------- /contrib/svn-fe/svn-fe.c: -------------------------------------------------------------------------------- 1 | /* 2 | * This file is in the public domain. 3 | * You may freely use, modify, distribute, and relicense it. 4 | */ 5 | 6 | #include 7 | #include "svndump.h" 8 | 9 | int main(int argc, char **argv) 10 | { 11 | if (svndump_init(NULL)) 12 | return 1; 13 | svndump_read((argc > 1) ? argv[1] : NULL, "refs/heads/master", 14 | "refs/notes/svn/revs"); 15 | svndump_deinit(); 16 | svndump_reset(); 17 | return 0; 18 | } 19 | -------------------------------------------------------------------------------- /list-objects.h: -------------------------------------------------------------------------------- 1 | #ifndef LIST_OBJECTS_H 2 | #define LIST_OBJECTS_H 3 | 4 | typedef void (*show_commit_fn)(struct commit *, void *); 5 | typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *); 6 | void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); 7 | 8 | typedef void (*show_edge_fn)(struct commit *); 9 | void mark_edges_uninteresting(struct rev_info *, show_edge_fn); 10 | 11 | #endif 12 | -------------------------------------------------------------------------------- /t/perf/min_time.perl: -------------------------------------------------------------------------------- 1 | #!/usr/bin/perl 2 | 3 | my $minrt = 1e100; 4 | my $min; 5 | 6 | while (<>) { 7 | # [h:]m:s.xx U.xx S.xx 8 | /^(?:(\d+):)?(\d+):(\d+(?:\.\d+)?) (\d+(?:\.\d+)?) (\d+(?:\.\d+)?)$/ 9 | or die "bad input line: $_"; 10 | my $rt = ((defined $1 ? $1 : 0.0)*60+$2)*60+$3; 11 | if ($rt < $minrt) { 12 | $min = $_; 13 | $minrt = $rt; 14 | } 15 | } 16 | 17 | if (!defined $min) { 18 | die "no input found"; 19 | } 20 | 21 | print $min; 22 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_master_master^_side: -------------------------------------------------------------------------------- 1 | $ git diff master master^ side 2 | diff --cc dir/sub 3 | index cead32e,7289e35..992913c 4 | --- a/dir/sub 5 | +++ b/dir/sub 6 | @@@ -1,6 -1,4 +1,8 @@@ 7 | A 8 | B 9 | +C 10 | +D 11 | +E 12 | +F 13 | + 1 14 | + 2 15 | diff --cc file0 16 | index b414108,f4615da..10a8a9f 17 | --- a/file0 18 | +++ b/file0 19 | @@@ -1,6 -1,6 +1,9 @@@ 20 | 1 21 | 2 22 | 3 23 | +4 24 | +5 25 | +6 26 | + A 27 | + B 28 | + C 29 | $ 30 | -------------------------------------------------------------------------------- /t/t4136-apply-check.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='git apply should exit non-zero with unrecognized input.' 4 | 5 | . ./test-lib.sh 6 | 7 | test_expect_success 'setup' ' 8 | test_commit 1 9 | ' 10 | 11 | test_expect_success 'apply --check exits non-zero with unrecognized input' ' 12 | test_must_fail git apply --check - <<-\EOF 13 | I am not a patch 14 | I look nothing like a patch 15 | git apply must fail 16 | EOF 17 | ' 18 | 19 | test_done 20 | -------------------------------------------------------------------------------- /Documentation/sequencer.txt: -------------------------------------------------------------------------------- 1 | --continue:: 2 | Continue the operation in progress using the information in 3 | '.git/sequencer'. Can be used to continue after resolving 4 | conflicts in a failed cherry-pick or revert. 5 | 6 | --quit:: 7 | Forget about the current operation in progress. Can be used 8 | to clear the sequencer state after a failed cherry-pick or 9 | revert. 10 | 11 | --abort:: 12 | Cancel the operation and return to the pre-sequence state. 13 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.10.5.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.10.5 Release Notes 2 | =========================== 3 | 4 | Fixes since v1.7.10.4 5 | --------------------- 6 | 7 | * "git fast-export" did not give a readable error message when the 8 | same mark erroneously appeared twice in the --import-marks input. 9 | 10 | * "git rebase -p" used to pay attention to rebase.autosquash which 11 | was wrong. "git rebase -p -i" should, but "git rebase -p" by 12 | itself should not. 13 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty=oneline_--root_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty=oneline --root initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a Initial 3 | :000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir 4 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 5 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 6 | $ 7 | -------------------------------------------------------------------------------- /vcs-svn/sliding_window.h: -------------------------------------------------------------------------------- 1 | #ifndef SLIDING_WINDOW_H_ 2 | #define SLIDING_WINDOW_H_ 3 | 4 | #include "strbuf.h" 5 | 6 | struct sliding_view { 7 | struct line_buffer *file; 8 | off_t off; 9 | size_t width; 10 | off_t max_off; /* -1 means unlimited */ 11 | struct strbuf buf; 12 | }; 13 | 14 | #define SLIDING_VIEW_INIT(input, len) { (input), 0, 0, (len), STRBUF_INIT } 15 | 16 | extern int move_window(struct sliding_view *view, off_t off, size_t width); 17 | 18 | #endif 19 | -------------------------------------------------------------------------------- /sha1-lookup.h: -------------------------------------------------------------------------------- 1 | #ifndef SHA1_LOOKUP_H 2 | #define SHA1_LOOKUP_H 3 | 4 | typedef const unsigned char *sha1_access_fn(size_t index, void *table); 5 | 6 | extern int sha1_pos(const unsigned char *sha1, 7 | void *table, 8 | size_t nr, 9 | sha1_access_fn fn); 10 | 11 | extern int sha1_entry_pos(const void *table, 12 | size_t elem_size, 13 | size_t key_offset, 14 | unsigned lo, unsigned hi, unsigned nr, 15 | const unsigned char *key); 16 | #endif 17 | -------------------------------------------------------------------------------- /Documentation/git-fsck-objects.txt: -------------------------------------------------------------------------------- 1 | git-fsck-objects(1) 2 | =================== 3 | 4 | NAME 5 | ---- 6 | git-fsck-objects - Verifies the connectivity and validity of the objects in the database 7 | 8 | 9 | SYNOPSIS 10 | -------- 11 | [verse] 12 | 'git fsck-objects' ... 13 | 14 | DESCRIPTION 15 | ----------- 16 | 17 | This is a synonym for linkgit:git-fsck[1]. Please refer to the 18 | documentation of that command. 19 | 20 | GIT 21 | --- 22 | Part of the linkgit:git[1] suite 23 | -------------------------------------------------------------------------------- /decorate.h: -------------------------------------------------------------------------------- 1 | #ifndef DECORATE_H 2 | #define DECORATE_H 3 | 4 | struct object_decoration { 5 | const struct object *base; 6 | void *decoration; 7 | }; 8 | 9 | struct decoration { 10 | const char *name; 11 | unsigned int size, nr; 12 | struct object_decoration *hash; 13 | }; 14 | 15 | extern void *add_decoration(struct decoration *n, const struct object *obj, void *decoration); 16 | extern void *lookup_decoration(struct decoration *n, const struct object *obj); 17 | 18 | #endif 19 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --root --stat --summary initial 2 | commit 444ac553ac7612cc88969031b02b3767fb8a353a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:00:00 2006 +0000 5 | 6 | Initial 7 | 8 | dir/sub | 2 ++ 9 | file0 | 3 +++ 10 | file2 | 3 +++ 11 | 3 files changed, 8 insertions(+) 12 | create mode 100644 dir/sub 13 | create mode 100644 file0 14 | create mode 100644 file2 15 | $ 16 | -------------------------------------------------------------------------------- /t/t4013/diff.rev-list_--children_HEAD: -------------------------------------------------------------------------------- 1 | $ git rev-list --children HEAD 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 59d314ad6f356dd08601a4cd5e530381da3e3c64 4 | 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 59d314ad6f356dd08601a4cd5e530381da3e3c64 5 | 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 6 | 444ac553ac7612cc88969031b02b3767fb8a353a 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4013/diff.rev-list_--parents_HEAD: -------------------------------------------------------------------------------- 1 | $ git rev-list --parents HEAD 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 | c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 444ac553ac7612cc88969031b02b3767fb8a353a 4 | 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 5 | 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 444ac553ac7612cc88969031b02b3767fb8a353a 6 | 444ac553ac7612cc88969031b02b3767fb8a353a 7 | $ 8 | -------------------------------------------------------------------------------- /t/t4109/expect-1: -------------------------------------------------------------------------------- 1 | #include 2 | #include 3 | 4 | int func(int num); 5 | void print_int(int num); 6 | void print_ln(); 7 | 8 | int main() { 9 | int i; 10 | 11 | for (i = 0; i < 10; i++) { 12 | print_int(func(i)); 13 | } 14 | 15 | print_ln(); 16 | 17 | return 0; 18 | } 19 | 20 | int func(int num) { 21 | return num * num; 22 | } 23 | 24 | void print_int(int num) { 25 | printf("%d", num); 26 | } 27 | 28 | void print_ln() { 29 | printf("\n"); 30 | } 31 | 32 | -------------------------------------------------------------------------------- /templates/hooks--pre-applypatch.sample: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # 3 | # An example hook script to verify what is about to be committed 4 | # by applypatch from an e-mail message. 5 | # 6 | # The hook should exit with non-zero status after issuing an 7 | # appropriate message if it wants to stop the commit. 8 | # 9 | # To enable this hook, rename this file to "pre-applypatch". 10 | 11 | . git-sh-setup 12 | test -x "$GIT_DIR/hooks/pre-commit" && 13 | exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} 14 | : 15 | -------------------------------------------------------------------------------- /test-scrap-cache-tree.c: -------------------------------------------------------------------------------- 1 | #include "cache.h" 2 | #include "tree.h" 3 | #include "cache-tree.h" 4 | 5 | static struct lock_file index_lock; 6 | 7 | int main(int ac, char **av) 8 | { 9 | int fd = hold_locked_index(&index_lock, 1); 10 | if (read_cache() < 0) 11 | die("unable to read index file"); 12 | active_cache_tree = NULL; 13 | if (write_cache(fd, active_cache, active_nr) 14 | || commit_lock_file(&index_lock)) 15 | die("unable to write index file"); 16 | return 0; 17 | } 18 | -------------------------------------------------------------------------------- /mergetools/araxis: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 3 | } 4 | 5 | merge_cmd () { 6 | touch "$BACKUP" 7 | if $base_present 8 | then 9 | "$merge_tool_path" -wait -merge -3 -a1 \ 10 | "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 11 | else 12 | "$merge_tool_path" -wait -2 \ 13 | "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 14 | fi 15 | check_unchanged 16 | } 17 | 18 | translate_merge_tool_path() { 19 | echo compare 20 | } 21 | -------------------------------------------------------------------------------- /send-pack.h: -------------------------------------------------------------------------------- 1 | #ifndef SEND_PACK_H 2 | #define SEND_PACK_H 3 | 4 | struct send_pack_args { 5 | unsigned verbose:1, 6 | quiet:1, 7 | porcelain:1, 8 | progress:1, 9 | send_mirror:1, 10 | force_update:1, 11 | use_thin_pack:1, 12 | use_ofs_delta:1, 13 | dry_run:1, 14 | stateless_rpc:1; 15 | }; 16 | 17 | int send_pack(struct send_pack_args *args, 18 | int fd[], struct child_process *conn, 19 | struct ref *remote_refs, struct sha1_array *extra_have); 20 | 21 | #endif 22 | -------------------------------------------------------------------------------- /t/t4034/html/expect: -------------------------------------------------------------------------------- 1 | diff --git a/pre b/post 2 | index 8ca4aea..46921e5 100644 3 | --- a/pre 4 | +++ b/post 5 | @@ -1,3 +1,3 @@ 6 | newattr="newvalue">added content 7 | "value""newvalue">contentchanged 8 | <tagnewtag>content &entity;&newentity;</tag/newtag> 9 | -------------------------------------------------------------------------------- /t/t6110-rev-list-sparse.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='operations that cull histories in unusual ways' 4 | . ./test-lib.sh 5 | 6 | test_expect_success setup ' 7 | test_commit A && 8 | test_commit B && 9 | test_commit C && 10 | git checkout -b side HEAD^ && 11 | test_commit D && 12 | test_commit E && 13 | git merge master 14 | ' 15 | 16 | test_expect_success 'rev-list --first-parent --boundary' ' 17 | git rev-list --first-parent --boundary HEAD^.. 18 | ' 19 | 20 | test_done 21 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--cc_master: -------------------------------------------------------------------------------- 1 | $ git diff-tree --cc master 2 | 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | diff --cc dir/sub 4 | index cead32e,7289e35..992913c 5 | --- a/dir/sub 6 | +++ b/dir/sub 7 | @@@ -1,6 -1,4 +1,8 @@@ 8 | A 9 | B 10 | +C 11 | +D 12 | +E 13 | +F 14 | + 1 15 | + 2 16 | diff --cc file0 17 | index b414108,f4615da..10a8a9f 18 | --- a/file0 19 | +++ b/file0 20 | @@@ -1,6 -1,6 +1,9 @@@ 21 | 1 22 | 2 23 | 3 24 | +4 25 | +5 26 | +6 27 | + A 28 | + B 29 | + C 30 | $ 31 | -------------------------------------------------------------------------------- /t/t4252/am-test-4-2: -------------------------------------------------------------------------------- 1 | From: A U Thor 2 | Date: Thu Dec 4 16:00:00 2008 -0800 3 | Subject: Six 4 | 5 | Applying this patch with -C1 -p2 should be successful even though 6 | the patch is against a wrong level and the first context line does 7 | not match. 8 | 9 | diff --git i/junk/file-2 w/junk/file-2 10 | index 06e567b..b6f3a16 100644 11 | --- i/junk/file-2 12 | +++ w/junk/file-2 13 | @@ -1,7 +1,7 @@ 14 | One 15 | 2 16 | -3 17 | +Three 18 | 4 19 | 5 20 | -6 21 | +Six 22 | 7 23 | -------------------------------------------------------------------------------- /t/t5100/msg0005: -------------------------------------------------------------------------------- 1 | The git-cvsimport-script had a copule of small bugs that prevented me 2 | from importing a big CVS repository. 3 | 4 | The first was that it didn't handle removed files with a multi-digit 5 | primary revision number. 6 | 7 | The second was that it was asking the CVS server for "F" messages, 8 | although they were not handled. 9 | 10 | I also updated the documentation for that script to correspond to 11 | actual flags. 12 | 13 | Signed-off-by: David Kågedal 14 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.8.4.5.txt: -------------------------------------------------------------------------------- 1 | Git v1.8.4.5 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.8.4.4 5 | -------------------- 6 | 7 | * Recent update to remote-hg that attempted to make it work better 8 | with non ASCII pathnames fed Unicode strings to the underlying Hg 9 | API, which was wrong. 10 | 11 | * "git submodule init" copied "submodule.$name.update" settings from 12 | .gitmodules to .git/config without making sure if the suggested 13 | value was sensible. 14 | -------------------------------------------------------------------------------- /compat/win32/syslog.h: -------------------------------------------------------------------------------- 1 | #ifndef SYSLOG_H 2 | #define SYSLOG_H 3 | 4 | #define LOG_PID 0x01 5 | 6 | #define LOG_EMERG 0 7 | #define LOG_ALERT 1 8 | #define LOG_CRIT 2 9 | #define LOG_ERR 3 10 | #define LOG_WARNING 4 11 | #define LOG_NOTICE 5 12 | #define LOG_INFO 6 13 | #define LOG_DEBUG 7 14 | 15 | #define LOG_DAEMON (3<<3) 16 | 17 | void openlog(const char *ident, int logopt, int facility); 18 | void syslog(int priority, const char *fmt, ...); 19 | 20 | #endif /* SYSLOG_H */ 21 | -------------------------------------------------------------------------------- /contrib/mw-to-git/bin-wrapper/git: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | # git executable wrapper script for Git-Mediawiki to run tests without 4 | # installing all the scripts and perl packages. 5 | 6 | GIT_ROOT_DIR=../../.. 7 | GIT_EXEC_PATH=$(cd "$(dirname "$0")" && cd ${GIT_ROOT_DIR} && pwd) 8 | 9 | GITPERLLIB="$GIT_EXEC_PATH"'/contrib/mw-to-git'"${GITPERLLIB:+:$GITPERLLIB}" 10 | PATH="$GIT_EXEC_PATH"'/contrib/mw-to-git:'"$PATH" 11 | 12 | export GITPERLLIB PATH 13 | 14 | exec "${GIT_EXEC_PATH}/bin-wrappers/git" "$@" 15 | -------------------------------------------------------------------------------- /pack-revindex.h: -------------------------------------------------------------------------------- 1 | #ifndef PACK_REVINDEX_H 2 | #define PACK_REVINDEX_H 3 | 4 | struct revindex_entry { 5 | off_t offset; 6 | unsigned int nr; 7 | }; 8 | 9 | struct pack_revindex { 10 | struct packed_git *p; 11 | struct revindex_entry *revindex; 12 | }; 13 | 14 | struct pack_revindex *revindex_for_pack(struct packed_git *p); 15 | int find_revindex_position(struct pack_revindex *pridx, off_t ofs); 16 | 17 | struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs); 18 | 19 | #endif 20 | -------------------------------------------------------------------------------- /t/t8002-blame.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='git blame' 4 | . ./test-lib.sh 5 | 6 | PROG='git blame -c' 7 | . "$TEST_DIRECTORY"/annotate-tests.sh 8 | 9 | PROG='git blame -c -e' 10 | test_expect_success 'blame --show-email' ' 11 | check_count \ 12 | "" 1 \ 13 | "" 1 \ 14 | "" 1 \ 15 | "" 1 \ 16 | "" 1 \ 17 | "" 1 \ 18 | "" 1 \ 19 | "" 1 20 | ' 21 | 22 | test_done 23 | -------------------------------------------------------------------------------- /test-subprocess.c: -------------------------------------------------------------------------------- 1 | #include "cache.h" 2 | #include "run-command.h" 3 | 4 | int main(int argc, char **argv) 5 | { 6 | struct child_process cp; 7 | int nogit = 0; 8 | 9 | setup_git_directory_gently(&nogit); 10 | if (nogit) 11 | die("No git repo found"); 12 | if (argc > 1 && !strcmp(argv[1], "--setup-work-tree")) { 13 | setup_work_tree(); 14 | argv++; 15 | } 16 | memset(&cp, 0, sizeof(cp)); 17 | cp.git_cmd = 1; 18 | cp.argv = (const char **)argv + 1; 19 | return run_command(&cp); 20 | } 21 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.9.6.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.9.6 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.9.5 5 | -------------------- 6 | 7 | * "git merge $tag" to merge an annotated tag always opens the editor 8 | during an interactive edit session. v1.7.10 series introduced an 9 | environment variable GIT_MERGE_AUTOEDIT to help older scripts decline 10 | this behaviour, but the maintenance track should also support it. 11 | 12 | Also contains minor fixes and documentation updates. 13 | -------------------------------------------------------------------------------- /contrib/emacs/Makefile: -------------------------------------------------------------------------------- 1 | ## Build and install stuff 2 | 3 | EMACS = emacs 4 | 5 | ELC = git.elc git-blame.elc 6 | INSTALL ?= install 7 | INSTALL_ELC = $(INSTALL) -m 644 8 | prefix ?= $(HOME) 9 | emacsdir = $(prefix)/share/emacs/site-lisp 10 | RM ?= rm -f 11 | 12 | all: $(ELC) 13 | 14 | install: all 15 | $(INSTALL) -d $(DESTDIR)$(emacsdir) 16 | $(INSTALL_ELC) $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir) 17 | 18 | %.elc: %.el 19 | $(EMACS) -batch -f batch-byte-compile $< 20 | 21 | clean:; $(RM) $(ELC) 22 | -------------------------------------------------------------------------------- /t/t4109/patch1.patch: -------------------------------------------------------------------------------- 1 | diff --git a/main.c b/main.c 2 | new file mode 100644 3 | --- /dev/null 4 | +++ b/main.c 5 | @@ -0,0 +1,23 @@ 6 | +#include 7 | + 8 | +int func(int num); 9 | +void print_int(int num); 10 | + 11 | +int main() { 12 | + int i; 13 | + 14 | + for (i = 0; i < 10; i++) { 15 | + print_int(func(i)); 16 | + } 17 | + 18 | + return 0; 19 | +} 20 | + 21 | +int func(int num) { 22 | + return num * num; 23 | +} 24 | + 25 | +void print_int(int num) { 26 | + printf("%d", num); 27 | +} 28 | + 29 | -------------------------------------------------------------------------------- /t/t9121-git-svn-fetch-renamed-dir.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # 3 | # Copyright (c) 2008 Santhosh Kumar Mani 4 | 5 | 6 | test_description='git svn can fetch renamed directories' 7 | 8 | . ./lib-git-svn.sh 9 | 10 | test_expect_success 'load repository with renamed directory' ' 11 | svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump 12 | ' 13 | 14 | test_expect_success 'init and fetch repository' ' 15 | git svn init "$svnrepo/newname" && 16 | git svn fetch 17 | ' 18 | 19 | test_done 20 | 21 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.3.1.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.3.1 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.3 5 | ------------------ 6 | 7 | * "git stash show stash@{$n}" was accidentally broken in 1.7.3 ("git 8 | stash show" without any argument still worked, though). 9 | 10 | * "git stash branch $branch stash@{$n}" was accidentally broken in 11 | 1.7.3 and started dropping the named stash even when branch creation 12 | failed. 13 | 14 | And other minor fixes and documentation updates. 15 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.8.0.3.txt: -------------------------------------------------------------------------------- 1 | Git v1.8.0.3 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.8.0.2 5 | -------------------- 6 | 7 | * "git log -p -S" did not apply the textconv filter while 8 | looking for the . 9 | 10 | * In the documentation, some invalid example e-mail addresses were 11 | formatted into mailto: links. 12 | 13 | Also contains many documentation updates backported from the 'master' 14 | branch that is preparing for the upcoming 1.8.1 release. 15 | -------------------------------------------------------------------------------- /Documentation/git-merge-one-file.txt: -------------------------------------------------------------------------------- 1 | git-merge-one-file(1) 2 | ===================== 3 | 4 | NAME 5 | ---- 6 | git-merge-one-file - The standard helper program to use with git-merge-index 7 | 8 | 9 | SYNOPSIS 10 | -------- 11 | [verse] 12 | 'git merge-one-file' 13 | 14 | DESCRIPTION 15 | ----------- 16 | This is the standard helper program to use with 'git merge-index' 17 | to resolve a merge after the trivial merge done with 'git read-tree -m'. 18 | 19 | GIT 20 | --- 21 | Part of the linkgit:git[1] suite 22 | -------------------------------------------------------------------------------- /t/t4034/bibtex/post: -------------------------------------------------------------------------------- 1 | @article{aldous1987uie, 2 | title={{Ultimate instability of exponential back-off protocol for acknowledgment-based transmission control of random access communication channels}}, 3 | author={Aldous, David}, 4 | journal={Information Theory, IEEE Transactions on}, 5 | volume={Bogus.}, 6 | number={4}, 7 | pages={219--223}, 8 | year=1987, 9 | note={This is in fact a rather funny read since ethernet works well in practice. The {\em pre} reference is the right one, however.} 10 | } 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.0.8.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.0.8 Release Notes 2 | ========================== 3 | 4 | This is primarily to backport support for the new "add.ignoreErrors" 5 | name given to the existing "add.ignore-errors" configuration variable. 6 | 7 | The next version, Git 1.7.4, and future versions, will support both 8 | old and incorrect name and the new corrected name, but without this 9 | backport, users who want to use the new name "add.ignoreErrors" in 10 | their repositories cannot use older versions of Git. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.1.3.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.1.3 Release Notes 2 | ========================== 3 | 4 | This is primarily to backport support for the new "add.ignoreErrors" 5 | name given to the existing "add.ignore-errors" configuration variable. 6 | 7 | The next version, Git 1.7.4, and future versions, will support both 8 | old and incorrect name and the new corrected name, but without this 9 | backport, users who want to use the new name "add.ignoreErrors" in 10 | their repositories cannot use older versions of Git. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.2.4.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.2.4 Release Notes 2 | ========================== 3 | 4 | This is primarily to backport support for the new "add.ignoreErrors" 5 | name given to the existing "add.ignore-errors" configuration variable. 6 | 7 | The next version, Git 1.7.4, and future versions, will support both 8 | old and incorrect name and the new corrected name, but without this 9 | backport, users who want to use the new name "add.ignoreErrors" in 10 | their repositories cannot use older versions of Git. 11 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.8.3.1.txt: -------------------------------------------------------------------------------- 1 | Git v1.8.3.1 Release Notes 2 | ======================== 3 | 4 | Fixes since v1.8.3 5 | ------------------ 6 | 7 | * When $HOME is misconfigured to point at an unreadable directory, we 8 | used to complain and die. The check has been loosened. 9 | 10 | * Handling of negative exclude pattern for directories "!dir" was 11 | broken in the update to v1.8.3. 12 | 13 | Also contains a handful of trivial code clean-ups, documentation 14 | updates, updates to the test suite, etc. 15 | -------------------------------------------------------------------------------- /Documentation/gitglossary.txt: -------------------------------------------------------------------------------- 1 | gitglossary(7) 2 | ============== 3 | 4 | NAME 5 | ---- 6 | gitglossary - A Git Glossary 7 | 8 | SYNOPSIS 9 | -------- 10 | * 11 | 12 | DESCRIPTION 13 | ----------- 14 | 15 | include::glossary-content.txt[] 16 | 17 | SEE ALSO 18 | -------- 19 | linkgit:gittutorial[7], 20 | linkgit:gittutorial-2[7], 21 | linkgit:gitcvs-migration[7], 22 | link:everyday.html[Everyday Git], 23 | link:user-manual.html[The Git User's Manual] 24 | 25 | GIT 26 | --- 27 | Part of the linkgit:git[1] suite. 28 | -------------------------------------------------------------------------------- /compat/pread.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | ssize_t git_pread(int fd, void *buf, size_t count, off_t offset) 4 | { 5 | off_t current_offset; 6 | ssize_t rc; 7 | 8 | current_offset = lseek(fd, 0, SEEK_CUR); 9 | 10 | if (lseek(fd, offset, SEEK_SET) < 0) 11 | return -1; 12 | 13 | rc = read_in_full(fd, buf, count); 14 | 15 | if (current_offset != lseek(fd, current_offset, SEEK_SET)) 16 | return -1; 17 | return rc; 18 | } 19 | -------------------------------------------------------------------------------- /mergetools/codecompare: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" 3 | } 4 | 5 | merge_cmd () { 6 | touch "$BACKUP" 7 | if $base_present 8 | then 9 | "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ 10 | -RF="$MERGED" 11 | else 12 | "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ 13 | -RF="$MERGED" 14 | fi 15 | check_unchanged 16 | } 17 | 18 | translate_merge_tool_path() { 19 | if merge_mode 20 | then 21 | echo CodeMerge 22 | else 23 | echo CodeCompare 24 | fi 25 | } 26 | -------------------------------------------------------------------------------- /t/t4109/patch2.patch: -------------------------------------------------------------------------------- 1 | diff --git a/main.c b/main.c 2 | --- a/main.c 3 | +++ b/main.c 4 | @@ -1,7 +1,9 @@ 5 | +#include 6 | #include 7 | 8 | int func(int num); 9 | void print_int(int num); 10 | +void print_ln(); 11 | 12 | int main() { 13 | int i; 14 | @@ -10,6 +12,8 @@ 15 | print_int(func(i)); 16 | } 17 | 18 | + print_ln(); 19 | + 20 | return 0; 21 | } 22 | 23 | @@ -21,3 +25,7 @@ 24 | printf("%d", num); 25 | } 26 | 27 | +void print_ln() { 28 | + printf("\n"); 29 | +} 30 | + 31 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.5.5.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.5.5 Release Notes 2 | ========================== 3 | 4 | I personally do not think there is any reason anybody should want to 5 | run v1.5.5.X series these days, because 'master' version is always 6 | more stable than any tagged released version of git. 7 | 8 | This is primarily to futureproof "git-shell" to accept requests 9 | without a dash between "git" and subcommand name (e.g. "git 10 | upload-pack") which the newer client will start to make sometime in 11 | the future. 12 | -------------------------------------------------------------------------------- /Documentation/technical/api-index-skel.txt: -------------------------------------------------------------------------------- 1 | Git API Documents 2 | ================= 3 | 4 | Git has grown a set of internal API over time. This collection 5 | documents them. 6 | 7 | //////////////////////////////////////////////////////////////// 8 | // table of contents begin 9 | //////////////////////////////////////////////////////////////// 10 | 11 | //////////////////////////////////////////////////////////////// 12 | // table of contents end 13 | //////////////////////////////////////////////////////////////// 14 | -------------------------------------------------------------------------------- /mergetools/bc3: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" "$LOCAL" "$REMOTE" 3 | } 4 | 5 | merge_cmd () { 6 | touch "$BACKUP" 7 | if $base_present 8 | then 9 | "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ 10 | -mergeoutput="$MERGED" 11 | else 12 | "$merge_tool_path" "$LOCAL" "$REMOTE" \ 13 | -mergeoutput="$MERGED" 14 | fi 15 | check_unchanged 16 | } 17 | 18 | translate_merge_tool_path() { 19 | if type bcomp >/dev/null 2>/dev/null 20 | then 21 | echo bcomp 22 | else 23 | echo bcompare 24 | fi 25 | } 26 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.8.3.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.8.3 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.8.2 5 | -------------------- 6 | 7 | * Attempt to fetch from an empty file pretending it to be a bundle did 8 | not error out correctly. 9 | 10 | * gitweb did not correctly fall back to configured $fallback_encoding 11 | that is not 'latin1'. 12 | 13 | * "git clone --depth $n" did not catch a non-number given as $n as an 14 | error. 15 | 16 | Also contains minor fixes and documentation updates. 17 | -------------------------------------------------------------------------------- /contrib/credential/osxkeychain/Makefile: -------------------------------------------------------------------------------- 1 | all:: git-credential-osxkeychain 2 | 3 | CC = gcc 4 | RM = rm -f 5 | CFLAGS = -g -O2 -Wall 6 | 7 | -include ../../../config.mak.autogen 8 | -include ../../../config.mak 9 | 10 | git-credential-osxkeychain: git-credential-osxkeychain.o 11 | $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security 12 | 13 | git-credential-osxkeychain.o: git-credential-osxkeychain.c 14 | $(CC) -c $(CFLAGS) $< 15 | 16 | clean: 17 | $(RM) git-credential-osxkeychain git-credential-osxkeychain.o 18 | -------------------------------------------------------------------------------- /mergetools/emerge: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" 3 | } 4 | 5 | merge_cmd () { 6 | if $base_present 7 | then 8 | "$merge_tool_path" \ 9 | -f emerge-files-with-ancestor-command \ 10 | "$LOCAL" "$REMOTE" "$BASE" \ 11 | "$(basename "$MERGED")" 12 | else 13 | "$merge_tool_path" \ 14 | -f emerge-files-command \ 15 | "$LOCAL" "$REMOTE" \ 16 | "$(basename "$MERGED")" 17 | fi 18 | status=$? 19 | } 20 | 21 | translate_merge_tool_path() { 22 | echo emacs 23 | } 24 | -------------------------------------------------------------------------------- /t/perf/p4001-diff-no-index.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description="Test diff --no-index performance" 4 | 5 | . ./perf-lib.sh 6 | 7 | test_perf_large_repo 8 | test_checkout_worktree 9 | 10 | file1=$(git ls-files | tail -n 2 | head -1) 11 | file2=$(git ls-files | tail -n 1 | head -1) 12 | 13 | test_expect_success "empty files, so they take no time to diff" " 14 | echo >$file1 && 15 | echo >$file2 16 | " 17 | 18 | test_perf "diff --no-index" " 19 | git diff --no-index $file1 $file2 >/dev/null 20 | " 21 | 22 | test_done 23 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.7.4.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.7.4 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.7.3 5 | -------------------- 6 | 7 | * A few header dependencies were missing from the Makefile. 8 | 9 | * Some newer parts of the code used C99 __VA_ARGS__ while we still 10 | try to cater to older compilers. 11 | 12 | * "git name-rev --all" tried to name all _objects_, naturally failing to 13 | describe many blobs and trees, instead of showing only commits as 14 | advertised in its documentation. 15 | -------------------------------------------------------------------------------- /t/t0200/test.sh: -------------------------------------------------------------------------------- 1 | # This is a phony Shell program that's only here to test xgettext 2 | # message extraction 3 | 4 | # so the above comment won't be folded into the next one by xgettext 5 | echo 6 | 7 | # TRANSLATORS: This is a test. You don't need to translate it. 8 | gettext "TEST: A Shell test string" 9 | 10 | # TRANSLATORS: This is a test. You don't need to translate it. 11 | eval_gettext "TEST: A Shell test \$variable" 12 | 13 | # TRANSLATORS: If you see this, Git has a bug 14 | _("TEST: A Shell string xgettext won't get") 15 | -------------------------------------------------------------------------------- /Documentation/git-init-db.txt: -------------------------------------------------------------------------------- 1 | git-init-db(1) 2 | ============== 3 | 4 | NAME 5 | ---- 6 | git-init-db - Creates an empty Git repository 7 | 8 | 9 | SYNOPSIS 10 | -------- 11 | [verse] 12 | 'git init-db' [-q | --quiet] [--bare] [--template=] [--separate-git-dir ] [--shared[=]] 13 | 14 | 15 | DESCRIPTION 16 | ----------- 17 | 18 | This is a synonym for linkgit:git-init[1]. Please refer to the 19 | documentation of that command. 20 | 21 | GIT 22 | --- 23 | Part of the linkgit:git[1] suite 24 | -------------------------------------------------------------------------------- /t/lib-bash.sh: -------------------------------------------------------------------------------- 1 | # Shell library sourced instead of ./test-lib.sh by tests that need 2 | # to run under Bash; primarily intended for tests of the completion 3 | # script. 4 | 5 | if test -n "$BASH" && test -z "$POSIXLY_CORRECT"; then 6 | # we are in full-on bash mode 7 | true 8 | elif type bash >/dev/null 2>&1; then 9 | # execute in full-on bash mode 10 | unset POSIXLY_CORRECT 11 | exec bash "$0" "$@" 12 | else 13 | echo '1..0 #SKIP skipping bash completion tests; bash not available' 14 | exit 0 15 | fi 16 | 17 | . ./test-lib.sh 18 | -------------------------------------------------------------------------------- /compat/strcasestr.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | 3 | char *gitstrcasestr(const char *haystack, const char *needle) 4 | { 5 | int nlen = strlen(needle); 6 | int hlen = strlen(haystack) - nlen + 1; 7 | int i; 8 | 9 | for (i = 0; i < hlen; i++) { 10 | int j; 11 | for (j = 0; j < nlen; j++) { 12 | unsigned char c1 = haystack[i+j]; 13 | unsigned char c2 = needle[j]; 14 | if (toupper(c1) != toupper(c2)) 15 | goto next; 16 | } 17 | return (char *) haystack + i; 18 | next: 19 | ; 20 | } 21 | return NULL; 22 | } 23 | -------------------------------------------------------------------------------- /t/t0200/test.perl: -------------------------------------------------------------------------------- 1 | # This is a phony Perl program that's only here to test xgettext 2 | # message extraction 3 | 4 | # so the above comment won't be folded into the next one by xgettext 5 | 1; 6 | 7 | # TRANSLATORS: This is a test. You don't need to translate it. 8 | print __("TEST: A Perl test string"); 9 | 10 | # TRANSLATORS: This is a test. You don't need to translate it. 11 | printf __("TEST: A Perl test variable %s"), "moo"; 12 | 13 | # TRANSLATORS: If you see this, Git has a bug 14 | print _"TEST: A Perl string xgettext will not get"; 15 | -------------------------------------------------------------------------------- /Documentation/user-manual.conf: -------------------------------------------------------------------------------- 1 | [titles] 2 | underlines="__","==","--","~~","^^" 3 | 4 | [attributes] 5 | caret=^ 6 | startsb=[ 7 | endsb=] 8 | tilde=~ 9 | 10 | [linkgit-inlinemacro] 11 | {target}{0?({0})} 12 | 13 | ifdef::backend-docbook[] 14 | # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. 15 | [listingblock] 16 | {title} 17 | 18 | | 19 | 20 | {title#} 21 | endif::backend-docbook[] 22 | -------------------------------------------------------------------------------- /generate-cmdlist.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | echo "/* Automatically generated by $0 */ 4 | struct cmdname_help { 5 | char name[16]; 6 | char help[80]; 7 | }; 8 | 9 | static struct cmdname_help common_cmds[] = {" 10 | 11 | sed -n -e 's/^git-\([^ ]*\)[ ].* common.*/\1/p' command-list.txt | 12 | sort | 13 | while read cmd 14 | do 15 | sed -n ' 16 | /^NAME/,/git-'"$cmd"'/H 17 | ${ 18 | x 19 | s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", N_("\1")},/ 20 | p 21 | }' "Documentation/git-$cmd.txt" 22 | done 23 | echo "};" 24 | -------------------------------------------------------------------------------- /templates/hooks--applypatch-msg.sample: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # 3 | # An example hook script to check the commit log message taken by 4 | # applypatch from an e-mail message. 5 | # 6 | # The hook should exit with non-zero status after issuing an 7 | # appropriate message if it wants to stop the commit. The hook is 8 | # allowed to edit the commit message file. 9 | # 10 | # To enable this hook, rename this file to "applypatch-msg". 11 | 12 | . git-sh-setup 13 | test -x "$GIT_DIR/hooks/commit-msg" && 14 | exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} 15 | : 16 | -------------------------------------------------------------------------------- /url.h: -------------------------------------------------------------------------------- 1 | #ifndef URL_H 2 | #define URL_H 3 | 4 | extern int is_url(const char *url); 5 | extern int is_urlschemechar(int first_flag, int ch); 6 | extern char *url_decode(const char *url); 7 | extern char *url_decode_mem(const char *url, int len); 8 | extern char *url_decode_parameter_name(const char **query); 9 | extern char *url_decode_parameter_value(const char **query); 10 | 11 | extern void end_url_with_slash(struct strbuf *buf, const char *url); 12 | extern void str_end_url_with_slash(const char *url, char **dest); 13 | 14 | #endif /* URL_H */ 15 | -------------------------------------------------------------------------------- /Documentation/manpage-normal.xsl: -------------------------------------------------------------------------------- 1 | 4 | 6 | 7 | 8 | 9 | 10 | \ 11 | . 12 | 13 | 14 | -------------------------------------------------------------------------------- /contrib/fast-import/git-p4.README: -------------------------------------------------------------------------------- 1 | The git-p4 script moved to the top-level of the git source directory. 2 | 3 | Invoke it as any other git command, like "git p4 clone", for instance. 4 | 5 | Note that the top-level git-p4.py script is now the source. It is 6 | built using make to git-p4, which will be installed. 7 | 8 | Windows users can copy the git-p4.py source script directly, possibly 9 | invoking it through a batch file called "git-p4.bat" in the same folder. 10 | It should contain just one line: 11 | 12 | @python "%~d0%~p0git-p4.py" %* 13 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_side: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty side 2 | commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:03:00 2006 +0000 5 | 6 | Side 7 | 8 | :040000 040000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 f977ed46ae6873c1c30ab878e15a4accedc3618b M dir 9 | :100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d f4615da674c09df322d6ba8d6b21ecfb1b1ba510 M file0 10 | :000000 100644 0000000000000000000000000000000000000000 7289e35bff32727c08dda207511bec138fdb9ea5 A file3 11 | $ 12 | -------------------------------------------------------------------------------- /t/t4109/patch3.patch: -------------------------------------------------------------------------------- 1 | cat > patch3.patch <<\EOF 2 | diff --git a/main.c b/main.c 3 | --- a/main.c 4 | +++ b/main.c 5 | @@ -1,9 +1,7 @@ 6 | -#include 7 | #include 8 | 9 | int func(int num); 10 | void print_int(int num); 11 | -void print_ln(); 12 | 13 | int main() { 14 | int i; 15 | @@ -12,8 +10,6 @@ 16 | print_int(func(i)); 17 | } 18 | 19 | - print_ln(); 20 | - 21 | return 0; 22 | } 23 | 24 | @@ -25,7 +21,3 @@ 25 | printf("%d", num); 26 | } 27 | 28 | -void print_ln() { 29 | - printf("\n"); 30 | -} 31 | - 32 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three: -------------------------------------------------------------------------------- 1 | # master ../.git tag tag-one tag tag-three 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 tag 'tag-one' of ../ 3 | c61a82b60967180544e3c19f819ddbd0c9f89899 tag 'tag-three' of ../ 4 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 7 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 8 | -------------------------------------------------------------------------------- /t/t1003-read-tree-prefix.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # 3 | # Copyright (c) 2006 Junio C Hamano 4 | # 5 | 6 | test_description='git read-tree --prefix test. 7 | ' 8 | 9 | . ./test-lib.sh 10 | 11 | test_expect_success setup ' 12 | echo hello >one && 13 | git update-index --add one && 14 | tree=`git write-tree` && 15 | echo tree is $tree 16 | ' 17 | 18 | echo 'one 19 | two/one' >expect 20 | 21 | test_expect_success 'read-tree --prefix' ' 22 | git read-tree --prefix=two/ $tree && 23 | git ls-files >actual && 24 | cmp expect actual 25 | ' 26 | 27 | test_done 28 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_initial..side: -------------------------------------------------------------------------------- 1 | $ git diff initial..side 2 | diff --git a/dir/sub b/dir/sub 3 | index 35d242b..7289e35 100644 4 | --- a/dir/sub 5 | +++ b/dir/sub 6 | @@ -1,2 +1,4 @@ 7 | A 8 | B 9 | +1 10 | +2 11 | diff --git a/file0 b/file0 12 | index 01e79c3..f4615da 100644 13 | --- a/file0 14 | +++ b/file0 15 | @@ -1,3 +1,6 @@ 16 | 1 17 | 2 18 | 3 19 | +A 20 | +B 21 | +C 22 | diff --git a/file3 b/file3 23 | new file mode 100644 24 | index 0000000..7289e35 25 | --- /dev/null 26 | +++ b/file3 27 | @@ -0,0 +1,4 @@ 28 | +A 29 | +B 30 | +1 31 | +2 32 | $ 33 | -------------------------------------------------------------------------------- /t/t7062-wtstatus-ignorecase.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='git-status with core.ignorecase=true' 4 | 5 | . ./test-lib.sh 6 | 7 | test_expect_success 'status with hash collisions' ' 8 | # note: "V/", "V/XQANY/" and "WURZAUP/" produce the same hash code 9 | # in name-hash.c::hash_name 10 | mkdir V && 11 | mkdir V/XQANY && 12 | mkdir WURZAUP && 13 | touch V/XQANY/test && 14 | git config core.ignorecase true && 15 | git add . && 16 | # test is successful if git status completes (no endless loop) 17 | git status 18 | ' 19 | 20 | test_done 21 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.0.7.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.0.7 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.0.6 5 | -------------------- 6 | 7 | * "make NO_CURL=NoThanks install" was broken. 8 | 9 | * An overlong line after ".gitdir: " in a git file caused out of bounds 10 | access to an array on the stack. 11 | 12 | * "git config --path conf.var" to attempt to expand a variable conf.var 13 | that uses "~/" short-hand segfaulted when $HOME environment variable 14 | was not set. 15 | 16 | And other minor fixes and documentation updates. 17 | -------------------------------------------------------------------------------- /t/t1009-read-tree-new-index.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='test read-tree into a fresh index file' 4 | 5 | . ./test-lib.sh 6 | 7 | test_expect_success setup ' 8 | echo one >a && 9 | git add a && 10 | git commit -m initial 11 | ' 12 | 13 | test_expect_success 'non-existent index file' ' 14 | rm -f new-index && 15 | GIT_INDEX_FILE=new-index git read-tree master 16 | ' 17 | 18 | test_expect_success 'empty index file' ' 19 | rm -f new-index && 20 | > new-index && 21 | GIT_INDEX_FILE=new-index git read-tree master 22 | ' 23 | 24 | test_done 25 | 26 | -------------------------------------------------------------------------------- /t/t2011-checkout-invalid-head.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='checkout switching away from an invalid branch' 4 | 5 | . ./test-lib.sh 6 | 7 | test_expect_success 'setup' ' 8 | echo hello >world && 9 | git add world && 10 | git commit -m initial 11 | ' 12 | 13 | test_expect_success 'checkout should not start branch from a tree' ' 14 | test_must_fail git checkout -b newbranch master^{tree} 15 | ' 16 | 17 | test_expect_success 'checkout master from invalid HEAD' ' 18 | echo $_z40 >.git/HEAD && 19 | git checkout master -- 20 | ' 21 | 22 | test_done 23 | -------------------------------------------------------------------------------- /t/t3103-ls-tree-misc.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description=' 4 | Miscellaneous tests for git ls-tree. 5 | 6 | 1. git ls-tree fails in presence of tree damage. 7 | 8 | ' 9 | 10 | . ./test-lib.sh 11 | 12 | test_expect_success 'setup' ' 13 | mkdir a && 14 | touch a/one && 15 | git add a/one && 16 | git commit -m test 17 | ' 18 | 19 | test_expect_success 'ls-tree fails with non-zero exit code on broken tree' ' 20 | rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 && 21 | test_must_fail git ls-tree -r HEAD 22 | ' 23 | 24 | test_done 25 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_-r_initial..side: -------------------------------------------------------------------------------- 1 | $ git diff -r initial..side 2 | diff --git a/dir/sub b/dir/sub 3 | index 35d242b..7289e35 100644 4 | --- a/dir/sub 5 | +++ b/dir/sub 6 | @@ -1,2 +1,4 @@ 7 | A 8 | B 9 | +1 10 | +2 11 | diff --git a/file0 b/file0 12 | index 01e79c3..f4615da 100644 13 | --- a/file0 14 | +++ b/file0 15 | @@ -1,3 +1,6 @@ 16 | 1 17 | 2 18 | 3 19 | +A 20 | +B 21 | +C 22 | diff --git a/file3 b/file3 23 | new file mode 100644 24 | index 0000000..7289e35 25 | --- /dev/null 26 | +++ b/file3 27 | @@ -0,0 +1,4 @@ 28 | +A 29 | +B 30 | +1 31 | +2 32 | $ 33 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three: -------------------------------------------------------------------------------- 1 | # br-unconfig ../.git tag tag-one tag tag-three 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 tag 'tag-one' of ../ 3 | c61a82b60967180544e3c19f819ddbd0c9f89899 tag 'tag-three' of ../ 4 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 7 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 8 | -------------------------------------------------------------------------------- /t/t9135-git-svn-moved-branch-empty-file.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='test moved svn branch with missing empty files' 4 | 5 | . ./lib-git-svn.sh 6 | test_expect_success 'load svn dumpfile' ' 7 | svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9135/svn.dump" 8 | ' 9 | 10 | test_expect_success 'clone using git svn' 'git svn clone -s "$svnrepo" x' 11 | 12 | test_expect_success 'test that b1 exists and is empty' ' 13 | ( 14 | cd x && 15 | git reset --hard branch-c && 16 | test -f b1 && 17 | ! test -s b1 18 | ) 19 | ' 20 | 21 | test_done 22 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.7.7.5.txt: -------------------------------------------------------------------------------- 1 | Git v1.7.7.5 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.7.7.4 5 | -------------------- 6 | 7 | * After fetching from a remote that has very long refname, the reporting 8 | output could have corrupted by overrunning a static buffer. 9 | 10 | * "git checkout" and "git merge" treated in-tree .gitignore and exclude 11 | file in $GIT_DIR/info/ directory inconsistently when deciding which 12 | untracked files are ignored and expendable. 13 | 14 | Also contains minor fixes and documentation updates. 15 | -------------------------------------------------------------------------------- /Documentation/git-verify-tag.txt: -------------------------------------------------------------------------------- 1 | git-verify-tag(1) 2 | ================= 3 | 4 | NAME 5 | ---- 6 | git-verify-tag - Check the GPG signature of tags 7 | 8 | SYNOPSIS 9 | -------- 10 | [verse] 11 | 'git verify-tag' ... 12 | 13 | DESCRIPTION 14 | ----------- 15 | Validates the gpg signature created by 'git tag'. 16 | 17 | OPTIONS 18 | ------- 19 | -v:: 20 | --verbose:: 21 | Print the contents of the tag object before validating it. 22 | 23 | ...:: 24 | SHA-1 identifiers of Git tag objects. 25 | 26 | GIT 27 | --- 28 | Part of the linkgit:git[1] suite 29 | -------------------------------------------------------------------------------- /builtin/annotate.c: -------------------------------------------------------------------------------- 1 | /* 2 | * "git annotate" builtin alias 3 | * 4 | * Copyright (C) 2006 Ryan Anderson 5 | */ 6 | #include "git-compat-util.h" 7 | #include "builtin.h" 8 | 9 | int cmd_annotate(int argc, const char **argv, const char *prefix) 10 | { 11 | const char **nargv; 12 | int i; 13 | nargv = xmalloc(sizeof(char *) * (argc + 2)); 14 | 15 | nargv[0] = "annotate"; 16 | nargv[1] = "-c"; 17 | 18 | for (i = 1; i < argc; i++) { 19 | nargv[i+1] = argv[i]; 20 | } 21 | nargv[argc + 1] = NULL; 22 | 23 | return cmd_blame(argc + 1, nargv, prefix); 24 | } 25 | -------------------------------------------------------------------------------- /progress.h: -------------------------------------------------------------------------------- 1 | #ifndef PROGRESS_H 2 | #define PROGRESS_H 3 | 4 | struct progress; 5 | 6 | void display_throughput(struct progress *progress, off_t total); 7 | int display_progress(struct progress *progress, unsigned n); 8 | struct progress *start_progress(const char *title, unsigned total); 9 | struct progress *start_progress_delay(const char *title, unsigned total, 10 | unsigned percent_treshold, unsigned delay); 11 | void stop_progress(struct progress **progress); 12 | void stop_progress_msg(struct progress **progress, const char *msg); 13 | 14 | #endif 15 | -------------------------------------------------------------------------------- /t/t3102-ls-tree-wildcards.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='ls-tree with(out) globs' 4 | 5 | . ./test-lib.sh 6 | 7 | test_expect_success 'setup' ' 8 | mkdir a aa "a[a]" && 9 | touch a/one aa/two "a[a]/three" && 10 | git add a/one aa/two "a[a]/three" && 11 | git commit -m test 12 | ' 13 | 14 | test_expect_success 'ls-tree a[a] matches literally' ' 15 | cat >expected <actual && 19 | test_cmp expected actual 20 | ' 21 | 22 | test_done 23 | -------------------------------------------------------------------------------- /exec_cmd.h: -------------------------------------------------------------------------------- 1 | #ifndef GIT_EXEC_CMD_H 2 | #define GIT_EXEC_CMD_H 3 | 4 | extern void git_set_argv_exec_path(const char *exec_path); 5 | extern const char *git_extract_argv0_path(const char *path); 6 | extern const char *git_exec_path(void); 7 | extern void setup_path(void); 8 | extern const char **prepare_git_cmd(const char **argv); 9 | extern int execv_git_cmd(const char **argv); /* NULL terminated */ 10 | LAST_ARG_MUST_BE_NULL 11 | extern int execl_git_cmd(const char *cmd, ...); 12 | extern const char *system_path(const char *path); 13 | 14 | #endif /* GIT_EXEC_CMD_H */ 15 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--pretty_--root_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --pretty --root initial 2 | commit 444ac553ac7612cc88969031b02b3767fb8a353a 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:00:00 2006 +0000 5 | 6 | Initial 7 | 8 | :000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir 9 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 10 | :000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 11 | $ 12 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--abbrev_initial..side: -------------------------------------------------------------------------------- 1 | $ git diff --abbrev initial..side 2 | diff --git a/dir/sub b/dir/sub 3 | index 35d242b..7289e35 100644 4 | --- a/dir/sub 5 | +++ b/dir/sub 6 | @@ -1,2 +1,4 @@ 7 | A 8 | B 9 | +1 10 | +2 11 | diff --git a/file0 b/file0 12 | index 01e79c3..f4615da 100644 13 | --- a/file0 14 | +++ b/file0 15 | @@ -1,3 +1,6 @@ 16 | 1 17 | 2 18 | 3 19 | +A 20 | +B 21 | +C 22 | diff --git a/file3 b/file3 23 | new file mode 100644 24 | index 0000000..7289e35 25 | --- /dev/null 26 | +++ b/file3 27 | @@ -0,0 +1,4 @@ 28 | +A 29 | +B 30 | +1 31 | +2 32 | $ 33 | -------------------------------------------------------------------------------- /t/t5100/patch0009: -------------------------------------------------------------------------------- 1 | diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt 2 | index b426a14..97756ec 100644 3 | --- a/Documentation/diff-format.txt 4 | +++ b/Documentation/diff-format.txt 5 | @@ -81,7 +81,7 @@ The "diff" formatting options can be customized via the 6 | environment variable 'GIT_DIFF_OPTS'. For example, if you 7 | prefer context diff: 8 | 9 | - GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD) 10 | + GIT_DIFF_OPTS=-c git-diff-index -p HEAD 11 | 12 | 13 | 2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the 14 | -------------------------------------------------------------------------------- /compat/mkdir.c: -------------------------------------------------------------------------------- 1 | #include "../git-compat-util.h" 2 | #undef mkdir 3 | 4 | /* for platforms that can't deal with a trailing '/' */ 5 | int compat_mkdir_wo_trailing_slash(const char *dir, mode_t mode) 6 | { 7 | int retval; 8 | char *tmp_dir = NULL; 9 | size_t len = strlen(dir); 10 | 11 | if (len && dir[len-1] == '/') { 12 | if ((tmp_dir = strdup(dir)) == NULL) 13 | return -1; 14 | tmp_dir[len-1] = '\0'; 15 | } 16 | else 17 | tmp_dir = (char *)dir; 18 | 19 | retval = mkdir(tmp_dir, mode); 20 | if (tmp_dir != dir) 21 | free(tmp_dir); 22 | 23 | return retval; 24 | } 25 | -------------------------------------------------------------------------------- /streaming.h: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2011, Google Inc. 3 | */ 4 | #ifndef STREAMING_H 5 | #define STREAMING_H 1 6 | #include "cache.h" 7 | 8 | /* opaque */ 9 | struct git_istream; 10 | 11 | extern struct git_istream *open_istream(const unsigned char *, enum object_type *, unsigned long *, struct stream_filter *); 12 | extern int close_istream(struct git_istream *); 13 | extern ssize_t read_istream(struct git_istream *, void *, size_t); 14 | 15 | extern int stream_blob_to_fd(int fd, const unsigned char *, struct stream_filter *, int can_seek); 16 | 17 | #endif /* STREAMING_H */ 18 | -------------------------------------------------------------------------------- /t/t2014-switch.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='Peter MacMillan' 4 | . ./test-lib.sh 5 | 6 | test_expect_success setup ' 7 | echo Hello >file && 8 | git add file && 9 | test_tick && 10 | git commit -m V1 && 11 | echo Hello world >file && 12 | git add file && 13 | git checkout -b other 14 | ' 15 | 16 | test_expect_success 'check all changes are staged' ' 17 | git diff --exit-code 18 | ' 19 | 20 | test_expect_success 'second commit' ' 21 | git commit -m V2 22 | ' 23 | 24 | test_expect_success 'check' ' 25 | git diff --cached --exit-code 26 | ' 27 | 28 | test_done 29 | -------------------------------------------------------------------------------- /t/t4013/diff.log_-GF_-p_--pickaxe-all_master: -------------------------------------------------------------------------------- 1 | $ git log -GF -p --pickaxe-all master 2 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 3 | Author: A U Thor 4 | Date: Mon Jun 26 00:02:00 2006 +0000 5 | 6 | Third 7 | 8 | diff --git a/dir/sub b/dir/sub 9 | index 8422d40..cead32e 100644 10 | --- a/dir/sub 11 | +++ b/dir/sub 12 | @@ -2,3 +2,5 @@ A 13 | B 14 | C 15 | D 16 | +E 17 | +F 18 | diff --git a/file1 b/file1 19 | new file mode 100644 20 | index 0000000..b1e6722 21 | --- /dev/null 22 | +++ b/file1 23 | @@ -0,0 +1,3 @@ 24 | +A 25 | +B 26 | +C 27 | $ 28 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.0.4.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.0.4 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.5.0.3 5 | -------------------- 6 | 7 | * Bugfixes 8 | 9 | - git.el does not add duplicate sign-off lines. 10 | 11 | - git-commit shows the full stat of the resulting commit, not 12 | just about the files in the current directory, when run from 13 | a subdirectory. 14 | 15 | - "git-checkout -m '@{8 hours ago}'" had a funny failure from 16 | eval; fixed. 17 | 18 | - git-gui updates. 19 | 20 | * Documentation updates 21 | 22 | * User manual updates 23 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.0.7.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.0.7 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.5.0.6 5 | -------------------- 6 | 7 | * Bugfixes 8 | 9 | - git-upload-pack failed to close unused pipe ends, resulting 10 | in many zombies to hang around. 11 | 12 | - git-rerere was recording the contents of earlier hunks 13 | duplicated in later hunks. This prevented resolving the same 14 | conflict when performing the same merge the other way around. 15 | 16 | * Documentation 17 | 18 | - a few documentation fixes from Debian package maintainer. 19 | -------------------------------------------------------------------------------- /Documentation/git-unpack-file.txt: -------------------------------------------------------------------------------- 1 | git-unpack-file(1) 2 | ================== 3 | 4 | NAME 5 | ---- 6 | git-unpack-file - Creates a temporary file with a blob's contents 7 | 8 | 9 | 10 | SYNOPSIS 11 | -------- 12 | [verse] 13 | 'git unpack-file' 14 | 15 | DESCRIPTION 16 | ----------- 17 | Creates a file holding the contents of the blob specified by sha1. It 18 | returns the name of the temporary file in the following format: 19 | .merge_file_XXXXX 20 | 21 | OPTIONS 22 | ------- 23 | :: 24 | Must be a blob id 25 | 26 | GIT 27 | --- 28 | Part of the linkgit:git[1] suite 29 | -------------------------------------------------------------------------------- /Documentation/technical/api-in-core-index.txt: -------------------------------------------------------------------------------- 1 | in-core index API 2 | ================= 3 | 4 | Talk about and , things like: 5 | 6 | * cache -> the_index macros 7 | * read_index() 8 | * write_index() 9 | * ie_match_stat() and ie_modified(); how they are different and when to 10 | use which. 11 | * index_name_pos() 12 | * remove_index_entry_at() 13 | * remove_file_from_index() 14 | * add_file_to_index() 15 | * add_index_entry() 16 | * refresh_index() 17 | * discard_index() 18 | * cache_tree_invalidate_path() 19 | * cache_tree_update() 20 | 21 | (JC, Linus) 22 | -------------------------------------------------------------------------------- /patch-ids.h: -------------------------------------------------------------------------------- 1 | #ifndef PATCH_IDS_H 2 | #define PATCH_IDS_H 3 | 4 | struct patch_id { 5 | unsigned char patch_id[20]; 6 | char seen; 7 | }; 8 | 9 | struct patch_ids { 10 | struct diff_options diffopts; 11 | int nr, alloc; 12 | struct patch_id **table; 13 | struct patch_id_bucket *patches; 14 | }; 15 | 16 | int init_patch_ids(struct patch_ids *); 17 | int free_patch_ids(struct patch_ids *); 18 | struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *); 19 | struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *); 20 | 21 | #endif /* PATCH_IDS_H */ 22 | -------------------------------------------------------------------------------- /Documentation/manpage-1.72.xsl: -------------------------------------------------------------------------------- 1 | 4 | 6 | 7 | 8 | 9 | 11 | ▓ 12 | ⌂ 13 | 14 | 15 | -------------------------------------------------------------------------------- /t/Git-SVN/Utils/collapse_dotdot.t: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env perl 2 | 3 | use strict; 4 | use warnings; 5 | 6 | use Test::More 'no_plan'; 7 | 8 | use Git::SVN::Utils; 9 | my $collapse_dotdot = \&Git::SVN::Utils::_collapse_dotdot; 10 | 11 | my %tests = ( 12 | "foo/bar/baz" => "foo/bar/baz", 13 | ".." => "..", 14 | "foo/.." => "", 15 | "/foo/bar/../../baz" => "/baz", 16 | "deeply/.././deeply/nested" => "./deeply/nested", 17 | ); 18 | 19 | for my $arg (keys %tests) { 20 | my $want = $tests{$arg}; 21 | 22 | is $collapse_dotdot->($arg), $want, "_collapse_dotdot('$arg') => $want"; 23 | } 24 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_--tags_.._.git: -------------------------------------------------------------------------------- 1 | # master --tags ../.git 2 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /notes-cache.h: -------------------------------------------------------------------------------- 1 | #ifndef NOTES_CACHE_H 2 | #define NOTES_CACHE_H 3 | 4 | #include "notes.h" 5 | 6 | struct notes_cache { 7 | struct notes_tree tree; 8 | char *validity; 9 | }; 10 | 11 | void notes_cache_init(struct notes_cache *c, const char *name, 12 | const char *validity); 13 | int notes_cache_write(struct notes_cache *c); 14 | 15 | char *notes_cache_get(struct notes_cache *c, unsigned char sha1[20], size_t 16 | *outsize); 17 | int notes_cache_put(struct notes_cache *c, unsigned char sha1[20], 18 | const char *data, size_t size); 19 | 20 | #endif /* NOTES_CACHE_H */ 21 | -------------------------------------------------------------------------------- /shortlog.h: -------------------------------------------------------------------------------- 1 | #ifndef SHORTLOG_H 2 | #define SHORTLOG_H 3 | 4 | #include "string-list.h" 5 | 6 | struct shortlog { 7 | struct string_list list; 8 | int summary; 9 | int wrap_lines; 10 | int sort_by_number; 11 | int wrap; 12 | int in1; 13 | int in2; 14 | int user_format; 15 | int abbrev; 16 | 17 | char *common_repo_prefix; 18 | int email; 19 | struct string_list mailmap; 20 | }; 21 | 22 | void shortlog_init(struct shortlog *log); 23 | 24 | void shortlog_add_commit(struct shortlog *log, struct commit *commit); 25 | 26 | void shortlog_output(struct shortlog *log); 27 | 28 | #endif 29 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-branches-one: -------------------------------------------------------------------------------- 1 | # br-branches-one 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file: -------------------------------------------------------------------------------- 1 | # master ../.git tag tag-one-tree tag tag-three-file 2 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 3 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 4 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 5 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 8 | -------------------------------------------------------------------------------- /Documentation/git-parse-remote.txt: -------------------------------------------------------------------------------- 1 | git-parse-remote(1) 2 | =================== 3 | 4 | NAME 5 | ---- 6 | git-parse-remote - Routines to help parsing remote repository access parameters 7 | 8 | 9 | SYNOPSIS 10 | -------- 11 | [verse] 12 | '. "$(git --exec-path)/git-parse-remote"' 13 | 14 | DESCRIPTION 15 | ----------- 16 | This script is included in various scripts to supply 17 | routines to parse files under $GIT_DIR/remotes/ and 18 | $GIT_DIR/branches/ and configuration variables that are related 19 | to fetching, pulling and pushing. 20 | 21 | GIT 22 | --- 23 | Part of the linkgit:git[1] suite 24 | -------------------------------------------------------------------------------- /contrib/credential/gnome-keyring/Makefile: -------------------------------------------------------------------------------- 1 | MAIN:=git-credential-gnome-keyring 2 | all:: $(MAIN) 3 | 4 | CC = gcc 5 | RM = rm -f 6 | CFLAGS = -g -O2 -Wall 7 | 8 | -include ../../../config.mak.autogen 9 | -include ../../../config.mak 10 | 11 | INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0) 12 | LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0) 13 | 14 | SRCS:=$(MAIN).c 15 | OBJS:=$(SRCS:.c=.o) 16 | 17 | %.o: %.c 18 | $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -o $@ -c $< 19 | 20 | $(MAIN): $(OBJS) 21 | $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) 22 | 23 | clean: 24 | @$(RM) $(MAIN) $(OBJS) 25 | -------------------------------------------------------------------------------- /t/t4013/diff.diff_--cached: -------------------------------------------------------------------------------- 1 | diff --git a/dir/sub b/dir/sub 2 | new file mode 100644 3 | index 0000000..992913c 4 | --- /dev/null 5 | +++ b/dir/sub 6 | @@ -0,0 +1,8 @@ 7 | +A 8 | +B 9 | +C 10 | +D 11 | +E 12 | +F 13 | +1 14 | +2 15 | diff --git a/file0 b/file0 16 | new file mode 100644 17 | index 0000000..10a8a9f 18 | --- /dev/null 19 | +++ b/file0 20 | @@ -0,0 +1,9 @@ 21 | +1 22 | +2 23 | +3 24 | +4 25 | +5 26 | +6 27 | +A 28 | +B 29 | +C 30 | diff --git a/file1 b/file1 31 | new file mode 100644 32 | index 0000000..b1e6722 33 | --- /dev/null 34 | +++ b/file1 35 | @@ -0,0 +1,3 @@ 36 | +A 37 | +B 38 | +C 39 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_--tags_.._.git: -------------------------------------------------------------------------------- 1 | # br-unconfig --tags ../.git 2 | 0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_branches-one: -------------------------------------------------------------------------------- 1 | # master branches-one 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /Documentation/RelNotes/1.5.0.6.txt: -------------------------------------------------------------------------------- 1 | GIT v1.5.0.6 Release Notes 2 | ========================== 3 | 4 | Fixes since v1.5.0.5 5 | -------------------- 6 | 7 | * Bugfixes 8 | 9 | - a handful small fixes to gitweb. 10 | 11 | - build procedure for user-manual is fixed not to require locally 12 | installed stylesheets. 13 | 14 | - "git commit $paths" on paths whose earlier contents were 15 | already updated in the index were failing out. 16 | 17 | * Documentation 18 | 19 | - user-manual has better cross references. 20 | 21 | - gitweb installation/deployment procedure is now documented. 22 | -------------------------------------------------------------------------------- /t/t2006-checkout-index-basic.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='basic checkout-index tests 4 | ' 5 | 6 | . ./test-lib.sh 7 | 8 | test_expect_success 'checkout-index --gobbledegook' ' 9 | test_expect_code 129 git checkout-index --gobbledegook 2>err && 10 | test_i18ngrep "[Uu]sage" err 11 | ' 12 | 13 | test_expect_success 'checkout-index -h in broken repository' ' 14 | mkdir broken && 15 | ( 16 | cd broken && 17 | git init && 18 | >.git/index && 19 | test_expect_code 129 git checkout-index -h >usage 2>&1 20 | ) && 21 | test_i18ngrep "[Uu]sage" broken/usage 22 | ' 23 | 24 | test_done 25 | -------------------------------------------------------------------------------- /t/t4100/t-apply-1.expect: -------------------------------------------------------------------------------- 1 | Documentation/git-ssh-pull.txt | 12 ++++++------ 2 | Documentation/git-ssh-push.txt | 10 +++++----- 3 | Documentation/git.txt | 6 +++--- 4 | Makefile | 6 +++--- 5 | ssh-pull.c | 4 ++-- 6 | ssh-push.c | 14 +++++++------- 7 | 6 files changed, 26 insertions(+), 26 deletions(-) 8 | rename Documentation/{git-rpull.txt => git-ssh-pull.txt} (90%) 9 | rename Documentation/{git-rpush.txt => git-ssh-push.txt} (71%) 10 | rename rpull.c => ssh-pull.c (97%) 11 | rename rpush.c => ssh-push.c (93%) 12 | -------------------------------------------------------------------------------- /t/t4109/patch4.patch: -------------------------------------------------------------------------------- 1 | diff --git a/main.c b/main.c 2 | --- a/main.c 3 | +++ b/main.c 4 | @@ -1,13 +1,14 @@ 5 | #include 6 | 7 | int func(int num); 8 | -void print_int(int num); 9 | +int func2(int num); 10 | 11 | int main() { 12 | int i; 13 | 14 | for (i = 0; i < 10; i++) { 15 | - print_int(func(i)); 16 | + printf("%d", func(i)); 17 | + printf("%d", func3(i)); 18 | } 19 | 20 | return 0; 21 | @@ -17,7 +18,7 @@ 22 | return num * num; 23 | } 24 | 25 | -void print_int(int num) { 26 | - printf("%d", num); 27 | +int func2(int num) { 28 | + return num * num * num; 29 | } 30 | 31 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-branches-default: -------------------------------------------------------------------------------- 1 | # br-branches-default 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file: -------------------------------------------------------------------------------- 1 | # br-unconfig ../.git tag tag-one-tree tag tag-three-file 2 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 3 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 4 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 5 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 8 | -------------------------------------------------------------------------------- /t/t4013/diff.diff-tree_--root_-p_initial: -------------------------------------------------------------------------------- 1 | $ git diff-tree --root -p initial 2 | 444ac553ac7612cc88969031b02b3767fb8a353a 3 | diff --git a/dir/sub b/dir/sub 4 | new file mode 100644 5 | index 0000000..35d242b 6 | --- /dev/null 7 | +++ b/dir/sub 8 | @@ -0,0 +1,2 @@ 9 | +A 10 | +B 11 | diff --git a/file0 b/file0 12 | new file mode 100644 13 | index 0000000..01e79c3 14 | --- /dev/null 15 | +++ b/file0 16 | @@ -0,0 +1,3 @@ 17 | +1 18 | +2 19 | +3 20 | diff --git a/file2 b/file2 21 | new file mode 100644 22 | index 0000000..01e79c3 23 | --- /dev/null 24 | +++ b/file2 25 | @@ -0,0 +1,3 @@ 26 | +1 27 | +2 28 | +3 29 | $ 30 | -------------------------------------------------------------------------------- /t/t5100/patch0011: -------------------------------------------------------------------------------- 1 | --- 2 | builtin-mailinfo.c | 4 ++-- 3 | 4 | diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c 5 | index 3e5fe51..aabfe5c 100644 6 | --- a/builtin-mailinfo.c 7 | +++ b/builtin-mailinfo.c 8 | @@ -758,8 +758,8 @@ static void handle_body(void) 9 | /* process any boundary lines */ 10 | if (*content_top && is_multipart_boundary(&line)) { 11 | /* flush any leftover */ 12 | - if (line.len) 13 | - handle_filter(&line); 14 | + if (prev.len) 15 | + handle_filter(&prev); 16 | 17 | if (!handle_boundary()) 18 | goto handle_body_out; 19 | -- 20 | 1.6.0.rc2 21 | 22 | 23 | -------------------------------------------------------------------------------- /t/t5515/fetch.br-unconfig_branches-one: -------------------------------------------------------------------------------- 1 | # br-unconfig branches-one 2 | 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /t/t5515/fetch.master_branches-default: -------------------------------------------------------------------------------- 1 | # master branches-default 2 | 754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../ 3 | 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 4 | 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 5 | 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ 6 | c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ 7 | 0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../ 8 | 525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../ 9 | -------------------------------------------------------------------------------- /compat/hstrerror.c: -------------------------------------------------------------------------------- 1 | #include 2 | #include 3 | #include 4 | 5 | const char *githstrerror(int err) 6 | { 7 | static char buffer[48]; 8 | switch (err) 9 | { 10 | case HOST_NOT_FOUND: 11 | return "Authoritative answer: host not found"; 12 | case NO_DATA: 13 | return "Valid name, no data record of requested type"; 14 | case NO_RECOVERY: 15 | return "Non recoverable errors, FORMERR, REFUSED, NOTIMP"; 16 | case TRY_AGAIN: 17 | return "Non-authoritative \"host not found\", or SERVERFAIL"; 18 | } 19 | sprintf(buffer, "Name resolution error %d", err); 20 | return buffer; 21 | } 22 | -------------------------------------------------------------------------------- /contrib/mw-to-git/t/t9365-continuing-queries.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='Test the Git Mediawiki remote helper: queries w/ more than 500 results' 4 | 5 | . ./test-gitmw-lib.sh 6 | . $TEST_DIRECTORY/test-lib.sh 7 | 8 | test_check_precond 9 | 10 | test_expect_success 'creating page w/ >500 revisions' ' 11 | wiki_reset && 12 | for i in `test_seq 501` 13 | do 14 | echo "creating revision $i" && 15 | wiki_editpage foo "revision $i
" true 16 | done 17 | ' 18 | 19 | test_expect_success 'cloning page w/ >500 revisions' ' 20 | git clone mediawiki::'"$WIKI_URL"' mw_dir 21 | ' 22 | 23 | test_done 24 | -------------------------------------------------------------------------------- /mergetools/kdiff3: -------------------------------------------------------------------------------- 1 | diff_cmd () { 2 | "$merge_tool_path" \ 3 | --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ 4 | "$LOCAL" "$REMOTE" >/dev/null 2>&1 5 | } 6 | 7 | merge_cmd () { 8 | if $base_present 9 | then 10 | "$merge_tool_path" --auto \ 11 | --L1 "$MERGED (Base)" \ 12 | --L2 "$MERGED (Local)" \ 13 | --L3 "$MERGED (Remote)" \ 14 | -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ 15 | >/dev/null 2>&1 16 | else 17 | "$merge_tool_path" --auto \ 18 | --L1 "$MERGED (Local)" \ 19 | --L2 "$MERGED (Remote)" \ 20 | -o "$MERGED" "$LOCAL" "$REMOTE" \ 21 | >/dev/null 2>&1 22 | fi 23 | status=$? 24 | } 25 | -------------------------------------------------------------------------------- /t/t4013/diff.show_--first-parent_master: -------------------------------------------------------------------------------- 1 | $ git show --first-parent master 2 | commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 3 | Merge: 9a6d494 c7a2ab9 4 | Author: A U Thor 5 | Date: Mon Jun 26 00:04:00 2006 +0000 6 | 7 | Merge branch 'side' 8 | 9 | diff --git a/dir/sub b/dir/sub 10 | index cead32e..992913c 100644 11 | --- a/dir/sub 12 | +++ b/dir/sub 13 | @@ -4,3 +4,5 @@ C 14 | D 15 | E 16 | F 17 | +1 18 | +2 19 | diff --git a/file0 b/file0 20 | index b414108..10a8a9f 100644 21 | --- a/file0 22 | +++ b/file0 23 | @@ -4,3 +4,6 @@ 24 | 4 25 | 5 26 | 6 27 | +A 28 | +B 29 | +C 30 | $ 31 | -------------------------------------------------------------------------------- /Documentation/git-show-index.txt: -------------------------------------------------------------------------------- 1 | git-show-index(1) 2 | ================= 3 | 4 | NAME 5 | ---- 6 | git-show-index - Show packed archive index 7 | 8 | 9 | SYNOPSIS 10 | -------- 11 | [verse] 12 | 'git show-index' < idx-file 13 | 14 | 15 | DESCRIPTION 16 | ----------- 17 | Reads given idx file for packed Git archive created with 18 | 'git pack-objects' command, and dumps its contents. 19 | 20 | The information it outputs is subset of what you can get from 21 | 'git verify-pack -v'; this command only shows the packfile 22 | offset and SHA-1 of each object. 23 | 24 | GIT 25 | --- 26 | Part of the linkgit:git[1] suite 27 | -------------------------------------------------------------------------------- /t/t0055-beyond-symlinks.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | test_description='update-index and add refuse to add beyond symlinks' 4 | 5 | . ./test-lib.sh 6 | 7 | test_expect_success SYMLINKS setup ' 8 | >a && 9 | mkdir b && 10 | ln -s b c && 11 | >c/d && 12 | git update-index --add a b/d 13 | ' 14 | 15 | test_expect_success SYMLINKS 'update-index --add beyond symlinks' ' 16 | test_must_fail git update-index --add c/d && 17 | ! ( git ls-files | grep c/d ) 18 | ' 19 | 20 | test_expect_success SYMLINKS 'add beyond symlinks' ' 21 | test_must_fail git add c/d && 22 | ! ( git ls-files | grep c/d ) 23 | ' 24 | 25 | test_done 26 | --------------------------------------------------------------------------------