| 4682693 | Junio C Hamano | 06 September 2010, 07:12:04 UTC | Merge branch 'maint' * maint: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing && | 06 September 2010, 07:12:04 UTC |
| af24059 | Junio C Hamano | 06 September 2010, 07:11:59 UTC | Merge branch 'xx/trivial' into maint * xx/trivial: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing && | 06 September 2010, 07:11:59 UTC |
| d2c030d | Junio C Hamano | 06 September 2010, 05:32:05 UTC | tag.c: whitespace breakages fix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 05:32:05 UTC |
| 55b4e9e | Jared Hance | 05 September 2010, 19:36:33 UTC | Fix whitespace issue in object.c Change some expanded tabs (spaces) to tabs in object.c. Signed-off-by: Jared Hance <jaredhance@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 05:12:29 UTC |
| 65b26eb | Jens Lehmann | 05 September 2010, 12:56:11 UTC | t5505: add missing && Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 05:10:22 UTC |
| 02377cf | Junio C Hamano | 04 September 2010, 15:17:09 UTC | Merge branch 'jl/submodule-ignore-diff' * jl/submodule-ignore-diff: checkout: Use submodule.*.ignore settings from .git/config and .gitmodules checkout: Add test for diff.ignoreSubmodules checkout: respect diff.ignoreSubmodules setting Conflicts: builtin/checkout.c | 04 September 2010, 15:17:09 UTC |
| a2c6726 | Junio C Hamano | 04 September 2010, 15:15:36 UTC | Merge branch 'ab/test-2' * ab/test-2: (51 commits) tests: factor HOME=$(pwd) in test-lib.sh test-lib: use subshell instead of cd $new && .. && cd $old tests: simplify "missing PREREQ" message t/t0000-basic.sh: Run the passing TODO test inside its own test-lib test-lib: Allow overriding of TEST_DIRECTORY test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ test: Introduce $GIT_BUILD_DIR cvs tests: do not touch test CVS repositories shipped with source t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite t/t7105-reset-patch.sh: Add a PERL prerequisite t/t9001-send-email.sh: convert setup code to tests t/t9001-send-email.sh: change from skip_all=* to prereq skip t/t9001-send-email.sh: Remove needless PROG=* assignment t/t9600-cvsimport.sh: change from skip_all=* to prereq skip lib-patch-mode tests: change from skip_all=* to prereq skip t/t3701-add-interactive.sh: change from skip_all=* to prereq skip tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh t/Makefile: Create test-results dir for smoke target ... Conflicts: t/t6035-merge-dir-to-symlink.sh | 04 September 2010, 15:15:36 UTC |
| b480d38 | Junio C Hamano | 04 September 2010, 05:45:58 UTC | Merge branch 'js/detached-stash' * js/detached-stash: t3903: fix broken test_must_fail calls detached-stash: update Documentation detached-stash: tests of git stash with stash-like arguments detached-stash: simplify git stash show detached-stash: simplify git stash branch detached-stash: refactor git stash pop implementation detached-stash: simplify stash_drop detached-stash: simplify stash_apply detached-stash: work around git rev-parse failure to detect bad log refs detached-stash: introduce parse_flags_and_revs function | 04 September 2010, 05:45:58 UTC |
| 306d7e5 | Junio C Hamano | 04 September 2010, 05:24:29 UTC | Merge branch 'js/maint-reflog-beyond-horizon' * js/maint-reflog-beyond-horizon: t1503: fix broken test_must_fail calls rev-parse: tests git rev-parse --verify master@{n}, for various n sha1_name.c: use warning in preference to fprintf(stderr rev-parse: exit with non-zero status if ref@{n} is not valid. | 04 September 2010, 05:24:29 UTC |
| c208e05 | Junio C Hamano | 04 September 2010, 05:23:49 UTC | Merge branch 'dg/local-mod-error-messages' * dg/local-mod-error-messages: t7609-merge-co-error-msgs: test non-fast forward case too. Move "show_all_errors = 1" to setup_unpack_trees_porcelain() setup_unpack_trees_porcelain: take the whole options struct as parameter Move set_porcelain_error_msgs to unpack-trees.c and rename it Conflicts: merge-recursive.c | 04 September 2010, 05:23:49 UTC |
| f92d62e | Junio C Hamano | 04 September 2010, 05:23:13 UTC | Merge branch 'nd/maint-fix-replace' * nd/maint-fix-replace: parse_object: pass on the original sha1, not the replaced one | 04 September 2010, 05:23:13 UTC |
| 2e3400c | Nguyễn Thái Ngọc Duy | 03 September 2010, 20:51:53 UTC | parse_object: pass on the original sha1, not the replaced one Commit 0e87c36 (object: call "check_sha1_signature" with the replacement sha1) changed the first argument passed to parse_object_buffer() from "sha1" to "repl". With that change, the returned obj pointer has the replacement SHA1 in obj->sha1, not the original one. But when using lookup_commit() and then parse_commit() on a commit, we get an object pointer with the original sha1, but the commit content comes from the replacement commit. So the result we get from using parse_object() is different from the we get from using lookup_commit() followed by parse_commit(). It looks much simpler and safer to fix this inconsistency by passing "sha1" to parse_object_bufer() instead of "repl". The commit comment should be used to tell the the replacement commit is replacing another commit and why. So it should be easy to see that we have a replacement commit instead of an original one. And it is not a problem if the content of the commit is not consistent with the sha1 as cat-file piped to hash-object can be used to see the difference. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2010, 05:13:08 UTC |
| cd1547d | Junio C Hamano | 03 September 2010, 16:43:45 UTC | Merge branch 'ab/compat-regex' * ab/compat-regex: Fix compat/regex ANSIfication on MinGW autoconf: regex library detection typofix autoconf: don't use platform regex if it lacks REG_STARTEND t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND compat/regex: get rid of old-style definition compat/regex: define out variables only used under RE_ENABLE_I18N Change regerror() declaration from K&R style to ANSI C (C89) compat/regex: get the gawk regex engine to compile within git compat/regex: use the regex engine from gawk for compat Conflicts: compat/regex/regex.c | 03 September 2010, 16:43:45 UTC |
| c6babe5 | Junio C Hamano | 03 September 2010, 16:43:45 UTC | Merge branch 'nd/clone-depth-zero' * nd/clone-depth-zero: clone: warn users --depth is ignored in local clones | 03 September 2010, 16:43:45 UTC |
| f9c8e7c | Junio C Hamano | 03 September 2010, 16:43:44 UTC | Merge branch 'jn/maint-doc-user-manual-html-doctype' * jn/maint-doc-user-manual-html-doctype: docs: fix Makefile dependency for user manual Documentation: set a !DOCTYPE for user manual | 03 September 2010, 16:43:44 UTC |
| 1998f4c | Junio C Hamano | 03 September 2010, 16:43:44 UTC | Merge branch 'cb/maint-mergetool-no-tty' * cb/maint-mergetool-no-tty: mergetool: Remove explicit references to /dev/tty Conflicts: git-mergetool.sh | 03 September 2010, 16:43:44 UTC |
| 9502751 | Junio C Hamano | 03 September 2010, 16:43:44 UTC | Merge branch 'jn/apply-filename-with-sp' * jn/apply-filename-with-sp: apply: handle traditional patches with space in filename tests: exercise "git apply" with weird filenames apply: split quoted filename handling into new function | 03 September 2010, 16:43:44 UTC |
| 460645a | Junio C Hamano | 03 September 2010, 16:43:43 UTC | Merge branch 'jn/merge-custom-no-trivial' * jn/merge-custom-no-trivial: t7606: Avoid using head as a file name merge: let custom strategies intervene in trivial merges t7606 (merge-theirs): modernize style | 03 September 2010, 16:43:43 UTC |
| 7bdaf0b | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'jc/maint-doc-em-dash' * jc/maint-doc-em-dash: Work around em-dash handling in newer AsciiDoc | 03 September 2010, 16:43:42 UTC |
| b9f171c | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'mg/doc-bundle' * mg/doc-bundle: git-bundle.txt: Clarify rev-list-args restrictions git-bundle.txt: whitespace cleanup git-bundle.txt: Cleanup Conflicts: Documentation/git-bundle.txt | 03 September 2010, 16:43:42 UTC |
| c0808fe | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'jn/doc-backslash' * jn/doc-backslash: Documentation: remove stray backslash in show-branch discussion Documentation: remove stray backslashes from "Fighting regressions" article Documentation: do not convert ... operator to ellipses Documentation: avoid stray backslash in user manual Documentation: avoid stray backslashes in core tutorial Documentation: remove stray backslashes in rev-parse manual Documentation: remove backslash before ~ in fast-import manual Documentation: remove stray backslash from "git bundle" manual Documentation/technical: avoid stray backslash in parse-options API docs Documentation: remove backslashes in manpage synopses Documentation: clarify quoting in gitignore docs Documentation: clarify quoting in "git rm" example Documentation: add missing quotes to "git grep" examples Documentation: clarify quoting in "git add" example Documentation: unbreak regex in show-ref manual Documentation: quoting trouble in "git rm" discussion Documentation: tweak description of log.date | 03 September 2010, 16:43:42 UTC |
| 2b916ff | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'jn/update-contrib-example-merge' * jn/update-contrib-example-merge: (24 commits) merge script: learn --[no-]rerere-autoupdate merge script: notice @{-1} shorthand merge script: handle --no-ff --no-commit correctly merge script: --ff-only to disallow true merge merge script: handle many-way octopus merge script: handle -m --log correctly merge script: forbid merge -s index merge script: allow custom strategies merge script: merge -X<option> merge script: improve log message subject merge script: refuse to merge during merge merge script: tweak unmerged files message to match builtin merge script: --squash, --ff from unborn branch are errors fmt-merge-msg -m to override merge title merge-base --independent to print reduced parent list in a merge merge-base --octopus to mimic show-branch --merge-base Documentation: add a SEE ALSO section for merge-base t6200 (fmt-merge-msg): style nitpicks t6010 (merge-base): modernize style t7600 (merge): test merge from branch yet to be born ... | 03 September 2010, 16:43:42 UTC |
| 8aed4a5 | Junio C Hamano | 03 September 2010, 16:43:41 UTC | Merge branch 'jn/merge-renormalize' * jn/merge-renormalize: merge-recursive --renormalize rerere: never renormalize rerere: migrate to parse-options API t4200 (rerere): modernize style ll-merge: let caller decide whether to renormalize ll-merge: make flag easier to populate Documentation/technical: document ll_merge merge-trees: let caller decide whether to renormalize merge-trees: push choice to renormalize away from low level t6038 (merge.renormalize): check that it can be turned off t6038 (merge.renormalize): try checkout -m and cherry-pick t6038 (merge.renormalize): style nitpicks Don't expand CRLFs when normalizing text during merge Try normalizing files to avoid delete/modify conflicts when merging Avoid conflicts when merging branches with mixed normalization Conflicts: builtin/rerere.c t/t4200-rerere.sh | 03 September 2010, 16:43:41 UTC |
| 22ffc39 | Junio C Hamano | 03 September 2010, 16:39:38 UTC | Sync with 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:39:38 UTC |
| dd34b6b | Junio C Hamano | 03 September 2010, 16:38:53 UTC | Git 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:38:53 UTC |
| e78d01b | Thiago Farina | 30 August 2010, 03:30:22 UTC | builtin/merge_recursive.c: Add an usage string and make use of it. This improves the usage output by adding builtin_merge_recursive_usage string that follows the same pattern used by the other builtin commands. The previous output for git merger-recursive was: usage: merge-recursive <base>... -- <head> <remote> ... Now the output is: usage: git merge-recursive <base>... -- <head> <remote> ... Since cmd_merge_recursive is used to handle four different commands we need the %s in the usage string, so the following example: $ git merge-subtree -h Will output: usage: git merge-subtree <base>... -- <head> <remote> ... Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:37:10 UTC |
| 4bf9dd9 | Jens Lehmann | 01 September 2010, 21:28:27 UTC | t7406 & t7407: add missing && at end of lines Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:34:32 UTC |
| 1e28476 | Jens Lehmann | 01 September 2010, 21:01:49 UTC | t7405: cd inside subshell instead of around Instead of using `cd dir && (...) && cd..` use `(cd dir && ...)` This ensures that the test doesn't get caught in the subdirectory if there is an error in the subshell. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:33:23 UTC |
| c5978a5 | Matthieu Moy | 03 September 2010, 15:25:33 UTC | t7609-merge-co-error-msgs: test non-fast forward case too. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:31:59 UTC |
| 5e65ee3 | Matthieu Moy | 02 September 2010, 16:08:15 UTC | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() Not only this makes the code clearer since setting up the porcelain error message is meant to work with show_all_errors, but this fixes a call to setup_unpack_trees_porcelain() in git_merge_trees() which did not set show_all_errors. add_rejected_path() used to double-check whether it was running in plumbing mode. This check was ineffective since it was setting show_all_errors too late for traverse_trees() to see it, and is made useless by this patch. Remove it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:31:51 UTC |
| e294030 | Matthieu Moy | 02 September 2010, 11:57:34 UTC | setup_unpack_trees_porcelain: take the whole options struct as parameter This is a preparation patch to let setup_unpack_trees_porcelain set show_all_errors itself. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:31:41 UTC |
| dc1166e | Matthieu Moy | 02 September 2010, 11:57:33 UTC | Move set_porcelain_error_msgs to unpack-trees.c and rename it The function is currently dealing only with error messages, but the intent of calling it is really to notify the unpack-tree mechanics that it is running in porcelain mode. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:31:28 UTC |
| b49c452 | Junio C Hamano | 01 September 2010, 21:17:32 UTC | Prepare for 1.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 22:11:07 UTC |
| 88bf110 | Junio C Hamano | 01 September 2010, 22:10:18 UTC | Merge branch 'maint' * maint: Prepare for 1.7.2.3 | 01 September 2010, 22:10:18 UTC |
| 22da742 | Junio C Hamano | 01 September 2010, 21:15:35 UTC | Prepare for 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 22:10:03 UTC |
| af6c6e0 | Junio C Hamano | 01 September 2010, 21:05:05 UTC | Merge branch 'gp/pack-refs-remove-empty-dirs' into maint * gp/pack-refs-remove-empty-dirs: pack-refs: remove newly empty directories | 01 September 2010, 21:05:05 UTC |
| c7f649a | Junio C Hamano | 01 September 2010, 20:57:23 UTC | Merge branch 'sg/rerere-gc-old-still-used' into maint * sg/rerere-gc-old-still-used: rerere: fix overeager gc mingw_utime(): handle NULL times parameter | 01 September 2010, 20:57:23 UTC |
| e4f8fce | Junio C Hamano | 01 September 2010, 20:56:10 UTC | Merge branch 'np/maint-huge-delta-generation' into maint * np/maint-huge-delta-generation: fix >4GiB source delta assertion failure | 01 September 2010, 20:56:10 UTC |
| 6da28b4 | Junio C Hamano | 01 September 2010, 20:52:10 UTC | Merge branch 'dj/fetch-tagopt' into maint * dj/fetch-tagopt: fetch: allow command line --tags to override config | 01 September 2010, 20:52:10 UTC |
| e917918 | Junio C Hamano | 01 September 2010, 20:50:46 UTC | Merge branch 'da/fix-submodule-sync-superproject-config' into maint * da/fix-submodule-sync-superproject-config: submodule sync: Update "submodule.<name>.url" | 01 September 2010, 20:50:46 UTC |
| 061219f | Junio C Hamano | 01 September 2010, 20:43:55 UTC | Merge branch 'en/rebase-against-rebase-fix' into maint * en/rebase-against-rebase-fix: pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | 01 September 2010, 20:43:55 UTC |
| 7e42332 | Junio C Hamano | 01 September 2010, 16:25:17 UTC | install-webdoc: filter timestamp-only changes correctly The timestamp that follows "Last updated " is formatted differently depending on the version of AsciiDoc. Looking at 4604fe56 on "html" branch, you can see that AsciiDoc 7.0.2 used to give "02-Jul-2008 03:02:14 UTC" but AsciiDoc 8.2.5 gave "2008-09-19 06:33:25 UTC". We haven't been correctly filtering out phantom changes that result from only the build date for some time now, it seems. Just filter lines that begin with "Last updated ". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 16:25:17 UTC |
| e3efa9c | Junio C Hamano | 31 August 2010, 23:34:16 UTC | Merge branch 'np/maint-huge-delta-generation' * np/maint-huge-delta-generation: fix >4GiB source delta assertion failure | 31 August 2010, 23:34:16 UTC |
| 2acf365 | Junio C Hamano | 31 August 2010, 23:25:29 UTC | Merge branch 'da/fix-submodule-sync-superproject-config' * da/fix-submodule-sync-superproject-config: submodule sync: Update "submodule.<name>.url" | 31 August 2010, 23:25:29 UTC |
| ae76cb9 | Junio C Hamano | 31 August 2010, 23:25:11 UTC | Merge branch 'jn/cherry-revert-message-clean-up' * jn/cherry-revert-message-clean-up: tests: fix syntax error in "Use advise() for hints" test cherry-pick/revert: Use advise() for hints cherry-pick/revert: Use error() for failure message Introduce advise() to print hints Eliminate “Finished cherry-pick/revert” message t3508: add check_head_differs_from() helper function and use it revert: improve success message by adding abbreviated commit sha1 revert: don't print "Finished one cherry-pick." if commit failed revert: refactor commit code into a new run_git_commit() function revert: report success when using option --strategy | 31 August 2010, 23:25:11 UTC |
| 7cc1e38 | Junio C Hamano | 31 August 2010, 23:24:48 UTC | Merge branch 'cb/binary-patch-id' * cb/binary-patch-id: hash binary sha1 into patch id | 31 August 2010, 23:24:48 UTC |
| 0c1c798 | Junio C Hamano | 31 August 2010, 23:24:36 UTC | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice' * ab/maint-reset-mixed-w-pathspec-advice: reset: suggest what to do upon "git reset --mixed <paths>" | 31 August 2010, 23:24:36 UTC |
| 381b2e7 | Junio C Hamano | 31 August 2010, 23:24:24 UTC | Merge branch 'dj/fetch-tagopt' * dj/fetch-tagopt: fetch: allow command line --tags to override config | 31 August 2010, 23:24:24 UTC |
| 3f29dd6 | Junio C Hamano | 31 August 2010, 23:23:58 UTC | Merge branch 'en/d-f-conflict-fix' * en/d-f-conflict-fix: merge-recursive: Avoid excessive output for and reprocessing of renames merge-recursive: Fix multiple file rename across D/F conflict t6031: Add a testcase covering multiple renames across a D/F conflict merge-recursive: Fix typo Mark tests that use symlinks as needing SYMLINKS prerequisite t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test fast-import: Improve robustness when D->F changes provided in wrong order fast-export: Fix output order of D/F changes merge_recursive: Fix renames across paths below D/F conflicts merge-recursive: Fix D/F conflicts Add a rename + D/F conflict testcase Add additional testcases for D/F conflicts Conflicts: merge-recursive.c | 31 August 2010, 23:23:58 UTC |
| aca3550 | Junio C Hamano | 31 August 2010, 23:23:38 UTC | Merge branch 'jn/svn-fe' * jn/svn-fe: t/t9010-svn-fe.sh: add an +x bit to this test t9010 (svn-fe): avoid symlinks in test t9010 (svn-fe): use Unix-style path in URI vcs-svn: Avoid %z in format string vcs-svn: Rename dirent pool to build on Windows compat: add strtok_r() treap: style fix vcs-svn: remove build artifacts on "make clean" svn-fe manual: Clarify warning about deltas in dump files Update svn-fe manual SVN dump parser Infrastructure to write revisions in fast-export format Add stream helper library Add string-specific memory pool Add treap implementation Add memory pool library Introduce vcs-svn lib | 31 August 2010, 23:23:38 UTC |
| d7cc7c9 | Junio C Hamano | 31 August 2010, 23:23:35 UTC | Merge branch 'tr/maint-no-unquote-plus' * tr/maint-no-unquote-plus: Do not unquote + into ' ' in URLs | 31 August 2010, 23:23:35 UTC |
| 633142d | Junio C Hamano | 31 August 2010, 23:23:31 UTC | Merge branch 'jn/paginate-fix' * jn/paginate-fix: t7006 (pager): add missing TTY prerequisites merge-file: run setup_git_directory_gently() sooner var: run setup_git_directory_gently() sooner ls-remote: run setup_git_directory_gently() sooner index-pack: run setup_git_directory_gently() sooner config: run setup_git_directory_gently() sooner bundle: run setup_git_directory_gently() sooner apply: run setup_git_directory_gently() sooner grep: run setup_git_directory_gently() sooner shortlog: run setup_git_directory_gently() sooner git wrapper: allow setup_git_directory_gently() be called earlier setup: remember whether repository was found git wrapper: introduce startup_info struct Conflicts: builtin/index-pack.c | 31 August 2010, 23:23:31 UTC |
| 693fefe | Junio C Hamano | 31 August 2010, 23:23:19 UTC | Merge branch 'jn/maint-setup-fix' * jn/maint-setup-fix: setup: split off a function to handle ordinary .git directories Revert "rehabilitate 'git index-pack' inside the object store" setup: do not forget working dir from subdir of gitdir t4111 (apply): refresh index before applying patches to it setup: split off get_device_or_die helper setup: split off a function to handle hitting ceiling in repo search setup: split off code to handle stumbling upon a repository setup: split off a function to checks working dir for .git file setup: split off $GIT_DIR-set case from setup_git_directory_gently tests: try git apply from subdir of toplevel t1501 (rev-parse): clarify Conflicts: builtin/index-pack.c | 31 August 2010, 23:23:19 UTC |
| 1253164 | Junio C Hamano | 31 August 2010, 23:15:20 UTC | Merge branch 'en/fast-export-fix' * en/fast-export-fix: fast-export: Add a --full-tree option fast-export: Fix dropping of files with --import-marks and path limiting | 31 August 2010, 23:15:20 UTC |
| a621859 | Junio C Hamano | 31 August 2010, 23:15:03 UTC | Merge branch 'hv/autosquash-config' * hv/autosquash-config: add configuration variable for --autosquash option of interactive rebase | 31 August 2010, 23:15:03 UTC |
| e24058f | Junio C Hamano | 31 August 2010, 23:14:27 UTC | Merge branch 'sg/rerere-gc-old-still-used' * sg/rerere-gc-old-still-used: rerere: fix overeager gc mingw_utime(): handle NULL times parameter | 31 August 2010, 23:14:27 UTC |
| e4c62e6 | Matthieu Moy | 30 August 2010, 09:50:42 UTC | tests: factor HOME=$(pwd) in test-lib.sh The same pattern is used in many tests, and makes it easy for new ones to rely on $HOME being a trashable, clean, directory. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:02 UTC |
| 0d314ce | Ævar Arnfjörð Bjarmason | 30 August 2010, 12:00:42 UTC | test-lib: use subshell instead of cd $new && .. && cd $old Change the test_create_repo code added in v1.2.2~6 to use a subshell instead of keeping track of the old working directory and cd-ing back when it's done. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:02 UTC |
| 07431fc | Jonathan Nieder | 24 August 2010, 07:34:10 UTC | tests: simplify "missing PREREQ" message When a test has no prerequisites satisfied (the usual case), instead of "missing THING of THING", just say "missing THING". This does not affect the output when a test is skipped due to a missing prerequisites if another prerequisite is satisfied. For example: instead of ok 8 # skip notes work (missing EXPENSIVE of EXPENSIVE) ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE) write ok 8 # skip notes work (missing EXPENSIVE) ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE) Cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:02 UTC |
| 7b90511 | Ævar Arnfjörð Bjarmason | 19 August 2010, 16:08:12 UTC | t/t0000-basic.sh: Run the passing TODO test inside its own test-lib Change the passing TODO test in t0000-basic.sh to run inside its own test-lib.sh. The motivation is to have nothing out of the ordinary on a normal test run for test smoking purposes. If every normal test run has a passing TODO you're more likely to turn a blind eye to it and not to investigate cases where things really are passing unexpectedly. It also makes the prove(1) output less noisy. Before: All tests successful. Test Summary Report ------------------- ./t0000-basic.sh (Wstat: 0 Tests: 46 Failed: 0) TODO passed: 5 Files=484, Tests=6229, 143 wallclock secs ( 4.00 usr 4.15 sys + 104.77 cusr 351.57 csys = 464.49 CPU) Result: PASS And after: All tests successful. Files=484, Tests=6228, 139 wallclock secs ( 4.07 usr 4.25 sys + 104.54 cusr 350.85 csys = 463.71 CPU) Result: PASS Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:01 UTC |
| 62f5390 | Ævar Arnfjörð Bjarmason | 19 August 2010, 16:08:11 UTC | test-lib: Allow overriding of TEST_DIRECTORY Tests that test the test-lib.sh itself need to be executed in the dynamically created trash directory, so we can't assume $TEST_DIRECTORY is ../ for those. As a side benefit this change also makes it easy for us to move the t/*.sh tests into subdirectories if we ever want to do that. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:01 UTC |
| 6cec5c6 | Ævar Arnfjörð Bjarmason | 19 August 2010, 16:08:10 UTC | test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ Change code that used $TEST_DIRECTORY/.. to use $GIT_BUILD_DIR instead, the two are equivalent, but the latter is easier to read. This required moving the assignment od GIT_BUILD_DIR to earlier in the test-lib.sh file. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:01 UTC |
| aed604c | Ævar Arnfjörð Bjarmason | 19 August 2010, 16:08:09 UTC | test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ Change the redundant calls to $(pwd) to use $TEST_DIRECTORY instead. None of these were being executed after we cd'd somewhere else so they weren't actually needed. This also makes it easier to add support for overriding the test library location and run tests in a different directory than t/. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:12:01 UTC |
| 5688995 | Thomas Rast | 25 July 2010, 14:55:46 UTC | test: Introduce $GIT_BUILD_DIR Introduce a new variable $GIT_BUILD_DIR which can be used to locate data that resides under the build directory, and use that instead. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 19:11:06 UTC |
| d8a9480 | Anders Kaseorg | 27 August 2010, 17:38:16 UTC | gitweb: Don't die_error in git_tag after already printing headers This fixes an XML error when visiting a nonexistent tag (i.e. "../gitweb.cgi?p=git.git;a=tag;h=refs/tags/BADNAME"). Signed-off-by: Anders Kaseorg <andersk@mit.edu> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 16:52:48 UTC |
| 8d66bb0 | Jon Seymour | 31 August 2010, 14:49:20 UTC | t3903: fix broken test_must_fail calls Some tests in detached-stash are calling test_must_fail in such a way that the arguments to test_must_fail do, indeed, fail but not in the manner expected by the test. This patch removes the unnecessary and unhelpful double quotes. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 16:50:07 UTC |
| ba9eab7 | Jon Seymour | 31 August 2010, 14:49:19 UTC | t1503: fix broken test_must_fail calls Some tests in maint-reflog-beyond-horizon are calling test_must_fail in such a way that the arguments to test_must_fail do, indeed, fail but not in the manner expected by the test. This patch removes the unnecessary and unhelpful double quotes. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 August 2010, 16:49:23 UTC |
| 23b4c7b | Jens Lehmann | 28 August 2010, 14:50:07 UTC | checkout: Use submodule.*.ignore settings from .git/config and .gitmodules For "git status" and the diff family the submodule.*.ignore settings from .git/config and .gitmodules can be used to override the default set via diff.ignoreSubmodules on a per-submodule basis. Let's do this consistently and teach checkout to use these settings too. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2010, 07:37:37 UTC |
| 62ed009 | Jens Lehmann | 28 August 2010, 14:49:25 UTC | checkout: Add test for diff.ignoreSubmodules While at it, document that checkout uses this flag too in the Documentation. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2010, 07:37:30 UTC |
| eec0daf | Junio C Hamano | 30 August 2010, 06:37:02 UTC | Merge branch 'maint' * maint: t0003: add missing && at end of lines | 30 August 2010, 06:37:02 UTC |
| d3fd3d1 | Junio C Hamano | 30 August 2010, 06:36:57 UTC | Merge branch 'maint-1.7.1' into maint * maint-1.7.1: t0003: add missing && at end of lines | 30 August 2010, 06:36:57 UTC |
| 3cd4745 | Thiago Farina | 29 August 2010, 02:04:17 UTC | object.h: Add OBJECT_ARRAY_INIT macro and make use of it. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2010, 05:42:49 UTC |
| 520ea85 | Matthieu Moy | 28 August 2010, 18:18:36 UTC | t0003: add missing && at end of lines Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2010, 05:36:32 UTC |
| 515cc01 | Junio C Hamano | 26 August 2010, 23:42:59 UTC | Merge branch 'maint' * maint: for-each-ref: fix objectname:short bug tree-walk: Correct bitrotted comment about tree_entry() Fix 'git log' early pager startup error case | 26 August 2010, 23:42:59 UTC |
| ea16a03 | Jay Soffian | 26 August 2010, 21:34:29 UTC | for-each-ref: fix objectname:short bug When objectname:short was introduced, it forgot to copy the result of find_unique_abbrev. Because the result of find_unique_abbrev is a pointer to static buffer, this resulted in the same value being substituted in for each ref. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 August 2010, 23:42:25 UTC |
| ce518bb | Johannes Sixt | 26 August 2010, 07:58:26 UTC | Fix compat/regex ANSIfication on MinGW compat/regexec.c had a weird combination of function declaration in ANSI style and function definition in K&R style, for example: static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) internal_function; static unsigned re_copy_regs (regs, pmatch, nregs, regs_allocated) struct re_registers *regs; regmatch_t *pmatch; int nregs, regs_allocated; { ... } with this #define: #ifndef _LIBC # ifdef __i386__ # define internal_function __attribute ((regparm (3), stdcall)) # else # define internal_function # endif #endif The original version as shown above was fine, but with the ANSIfied function definition and in the case where internal_function is not empty, gcc identifies the declaration and definition as different and bails out. Adding internal_function to the definition doesn't help (it results in a syntax error); hence, remove it from the subset of declarations that gcc flags as erroneous. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 August 2010, 16:25:53 UTC |
| 2244eab | Elijah Newren | 25 August 2010, 02:53:11 UTC | tree-walk: Correct bitrotted comment about tree_entry() There was a code comment that referred to the "above two functions" but over time the functions immediately preceding the comment have changed. Just mention the relevant functions by name. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2010, 23:31:21 UTC |
| 175f6e5 | Johannes Schindelin | 25 August 2010, 10:34:57 UTC | checkout: respect diff.ignoreSubmodules setting When 'git checkout' reports uncommitted changes, it also does so for submodules. The default mode is now to look really hard into submodules, not only for different commits, but also for modified files. Since this can be pretty expensive when there are a lot (and large) submodules, there is the diff.ignoreSubmodules option. Let's respect that setting when 'git checkout' reports the uncommitted changes, since it does nothing else than a 'git diff --name-status'. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2010, 20:12:04 UTC |
| 1fda91b | Linus Torvalds | 24 August 2010, 17:33:59 UTC | Fix 'git log' early pager startup error case We start the pager too early for several git commands, which results in the errors sometimes going to the pager rather than show up as errors. This is often hidden by the fact that we pass in '-X' to less by default, which causes 'less' to exit for small output, but if you do export LESS=-S you can then clearly see the problem by doing git log --prretty which shows the error message ("fatal: unrecognized argument: --prretty") being sent to the pager. This happens for pretty much all git commands that use USE_PAGER, and then check arguments separately. But "git diff" does it too early too (even though it does an explicit setup_pager() call) This only fixes it for the trivial "git log" family case. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 August 2010, 19:11:59 UTC |
| b5442ca | Junio C Hamano | 24 August 2010, 18:02:04 UTC | Merge branch 'maint' * maint: parse-options: clarify PARSE_OPT_NOARG description t3302 (notes): Port to Solaris | 24 August 2010, 18:02:04 UTC |
| 9c46c05 | Jon Seymour | 24 August 2010, 04:52:44 UTC | rev-parse: tests git rev-parse --verify master@{n}, for various n This commit introduces tests that verify that rev-parse parses master@{n} correctly for various values of n less than, equal to and greater than the number of revisions in the reference log. In particular, these tests check that rev-parse exits with a non-zero status code and prints a message of the following form to stderr. fatal: Log for [^ ]* only has [0-9][0-9]* entries. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 17:46:15 UTC |
| eedce78 | Jon Seymour | 24 August 2010, 04:52:43 UTC | sha1_name.c: use warning in preference to fprintf(stderr This commit changes sha1_name.c to use warning instead of fprintf(stderr). Trailing newlines from message formats have been removed since warning adds one itself. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 17:46:14 UTC |
| e6eedc3 | Jon Seymour | 24 August 2010, 04:52:42 UTC | rev-parse: exit with non-zero status if ref@{n} is not valid. "The current behaviour of ref@{...} syntax parser is suboptimal: $ git rev-parse --verify jch@{99999} && echo true warning: Log for 'jch' only has 1368 entries. cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768 true It even knows that it is running off the cut-off point; it should just cause the caller to notice that fact. I don't think changing it to error out should cause any harm to existing callers." With this change: $ git rev-parse --verify jch@{99999} || echo false fatal: Log for 'jch' only has 1368 entries. false $ git rev-parse jch@{99999} || echo false fatal: Log for 'jch' only has 1368 entries. false Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 17:46:11 UTC |
| ef45e4d | Jonathan Nieder | 22 August 2010, 16:26:38 UTC | parse-options: clarify PARSE_OPT_NOARG description Here "takes no argument" means "does not take an argument". The latter phrasing might make it clearer that PARSE_OPT_NOARG does not make an option with an argument that can optionally be left off. Noticed-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 17:37:39 UTC |
| 6325ca3 | Jonathan Nieder | 24 August 2010, 07:14:53 UTC | t3302 (notes): Port to Solaris The time_notes script, which uses POSIX shell features, is currently sometimes run with a non-POSIX /bin/sh. Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 16:58:40 UTC |
| 0e1b501 | Brian Gernhardt | 23 August 2010, 20:15:47 UTC | t7606: Avoid using head as a file name A file named 'head' gets confused with the HEAD ref on case-insensitive file systems. Replace '>head' with '>head.new' to match the '>head.old' files they are compared to. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 16:56:34 UTC |
| 2839478 | Junio C Hamano | 23 August 2010, 21:20:25 UTC | Work around em-dash handling in newer AsciiDoc Older versions of AsciiDoc used to literally pass double dashes when we used them in our linkgit macros and manpage titles, but newer ones (the issue was first reported with AsciiDoc 8.5.2) turn them into em dashes. Define litdd (literal double-dash) custom attribute in asciidoc.conf to work this around. While we are at it, fix a few double-dashes (e.g. the description of "project--devo--version" convention used by tla, among other things) that used to be incorrectly written as em dashes in the body text to also use this attribute. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 16:48:20 UTC |
| 25641fc | Brian Gernhardt | 24 August 2010, 02:37:24 UTC | t7610: cd inside subshell instead of around Instead of using `cd dir && (...) && cd..` use `(cd dir && ...)` This ensures that the test doesn't get caught in the subdirectory if there is an error in the subshell. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 16:33:09 UTC |
| 24c61c4 | Nguyễn Thái Ngọc Duy | 23 August 2010, 12:08:22 UTC | clone: warn users --depth is ignored in local clones Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2010, 16:28:02 UTC |
| 1884df1 | Michael J Gruber | 23 August 2010, 09:02:39 UTC | git-bundle.txt: Clarify rev-list-args restrictions Currently, one could think that 'git bundle create' groks any 'git rev-list' expression. But in fact it requires a named reference to be present. Try and make this clearer. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 August 2010, 16:05:32 UTC |
| a619056 | Michael J Gruber | 23 August 2010, 09:02:38 UTC | git-bundle.txt: whitespace cleanup Use tabs, not 7 spaces. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 August 2010, 16:05:32 UTC |
| 5e1f960 | Michael J Gruber | 23 August 2010, 09:02:37 UTC | git-bundle.txt: Cleanup Cleanup various spellings of the same argument, as well as the code for the tilde: Since neither '~' nor '\~' work consistently, use '{tilde}'. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 August 2010, 16:05:32 UTC |
| bc38219 | Junio C Hamano | 23 August 2010, 03:18:37 UTC | Merge branch 'maint' * maint: Typos in code comments, an error message, documentation | 23 August 2010, 03:18:37 UTC |
| 3776ea9 | Ralf Wildenhues | 22 August 2010, 11:12:12 UTC | Typos in code comments, an error message, documentation Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2010, 20:26:13 UTC |
| 22e5e58 | Ralf Wildenhues | 22 August 2010, 11:12:12 UTC | Typos in code comments, an error message, documentation Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2010, 20:25:08 UTC |
| 2316824 | Junio C Hamano | 22 August 2010, 16:44:45 UTC | autoconf: regex library detection typofix | 22 August 2010, 16:44:45 UTC |
| 506049c | Nicolas Pitre | 21 August 2010, 05:00:13 UTC | fix >4GiB source delta assertion failure When people try insane things such as delta-compressing 4GiB files, they get this assertion: diff-delta.c:285: create_delta_index: Assertion `packed_entry - (struct index_entry *)mem == entries' failed. This happens because: 1) the 'entries' variable is an unsigned int 2) it is assigned with entries = (bufsize - 1) / RABIN_WINDOW (that itself is not a problem unless bufsize > 4G * RABIN_WINDOW) 3) the buffer is indexed from top to bottom starting at "data = buffer + entries * RABIN_WINDOW" and the multiplication here does indeed overflows, making the resulting top of the buffer much lower than expected. This makes the number of actually produced index entries smaller than what was computed initially, hence the assertion. Furthermore, the current delta encoding format cannot represent offsets into a reference buffer with more than 32 bits anyway. So let's just limit the number of entries to what the delta format can encode. Reported-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2010, 06:53:26 UTC |
| b0c6bf4 | Jon Seymour | 21 August 2010, 04:09:04 UTC | detached-stash: update Documentation Update the documentation to indicate that git stash branch only attempts to drop the specified stash if it looks like stash reference. Also changed the synopsis to more clearly indicate which commands require a stash entry reference as opposed to merely a stash-like commit. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2010, 06:51:22 UTC |
| daf7a0c | Jon Seymour | 21 August 2010, 04:09:03 UTC | detached-stash: tests of git stash with stash-like arguments Adds new tests which check that: * git stash branch handles a stash-like argument when there is a stash stack * git stash branch handles a stash-like argument when there is not a stash stack * git stash show handles a stash-like argument when there is a stash stack * git stash show handles a stash-like argument when there is not a stash stack * git stash drop fails early if the specified argument is not a stash reference * git stash pop fails early if the specified argument is not a stash reference * git stash * fails early if the reference supplied is bogus * git stash fails early with stash@{n} where n >= length of stash log Helped-by: Johannes Sixt Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2010, 06:51:22 UTC |
| a9bf09e | Jon Seymour | 21 August 2010, 04:09:02 UTC | detached-stash: simplify git stash show This commit refactors git stash show to make use of the assert_stash_like function. git show now dies if the presented argument is non-stash-like. Previous behaviour was to tolerate commits that were not even stash-like. Previously, git stash show would accept stash-like arguments, but only if there was a stash on the stack. Now, git stash accepts stash-like arguments always and only fails if no stash-like argument is specified and there is no stash stack. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2010, 06:51:22 UTC |
