- 25 8月, 2010 1 次提交
-
-
由 Nguyễn Thái Ngọc Duy 提交于
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 21 8月, 2010 11 次提交
-
-
由 Junio C Hamano 提交于
* maint: xmalloc: include size in the failure message
-
由 Junio C Hamano 提交于
* jc/maint-follow-rename-fix: log: test for regression introduced in v1.7.2-rc0~103^2~2 diff --follow: do call diffcore_std() as necessary diff --follow: do not waste cycles while recursing
-
由 Junio C Hamano 提交于
* jn/maint-plug-leak: write-tree: Avoid leak when index refers to an invalid object read-tree: stop leaking tree objects core: Stop leaking ondisk_cache_entrys
-
由 Junio C Hamano 提交于
* jn/fix-abbrev: examples/commit: use --abbrev for commit summary checkout, commit: remove confusing assignments to rev.abbrev archive: abbreviate substituted commit ids again
-
由 Junio C Hamano 提交于
* vs/doc-spell: Documentation: spelling fixes
-
由 Junio C Hamano 提交于
* jn/rebase-rename-am: rebase: protect against diff.renames configuration t3400 (rebase): whitespace cleanup Teach "apply --index-info" to handle rename patches t4150 (am): futureproof against failing tests t4150 (am): style fix
-
由 Junio C Hamano 提交于
* jn/doc-pull: Documentation: flesh out “git pull” description
-
由 Junio C Hamano 提交于
* bc/use-more-hardlinks-in-install: Makefile: make hard/symbolic links for non-builtins too Makefile: link builtins residing in bin directory to main git binary too
-
由 Junio C Hamano 提交于
* tr/rfc-reset-doc: Documentation/reset: move "undo permanently" example behind "make topic" Documentation/reset: reorder examples to match description Documentation/reset: promote 'examples' one section up Documentation/reset: separate options by mode Documentation/git-reset: reorder modes for soft-mixed-hard progression
-
由 Ramkumar Ramachandra 提交于
Fix "Switched to a new branch <name>" to read "Switched to branch <name>" when <name> corresponds to an existing branch. This bug was introduced in 02ac9837 while introducing the `-B` switch. Cc: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Matthieu Moy 提交于
Out-of-memory errors can either be actual lack of memory, or bugs (like code trying to call xmalloc(-1) by mistake). A little more information may help tracking bugs reported by users. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 8月, 2010 5 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* tr/xsize-bits: xsize_t: check whether we lose bits
-
由 Junio C Hamano 提交于
* jc/sha1-name-find-fix: sha1_name.c: fix parsing of ":/token" syntax Conflicts: sha1_name.c
-
由 Eric Wong 提交于
The "--parents" option did not appear until SVN 1.5.x and is completely unnecessary in this case. Reported-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NEric Wong <normalperson@yhbt.net>
-
- 19 8月, 2010 19 次提交
-
-
由 Junio C Hamano 提交于
* sp/fix-smart-http-deadlock-on-error: smart-http: Don't deadlock on server failure
-
由 Junio C Hamano 提交于
* jc/maint-follow-rename-fix: log: test for regression introduced in v1.7.2-rc0~103^2~2 diff --follow: do call diffcore_std() as necessary diff --follow: do not waste cycles while recursing
-
由 Junio C Hamano 提交于
* tf/string-list-init: string_list: Add STRING_LIST_INIT macro and make use of it.
-
由 Junio C Hamano 提交于
* cc/find-commit-subject: blame: use find_commit_subject() instead of custom code merge-recursive: use find_commit_subject() instead of custom code bisect: use find_commit_subject() instead of custom code revert: rename variables related to subject in get_message() revert: refactor code to find commit subject in find_commit_subject() revert: fix off by one read when searching the end of a commit subject
-
由 Junio C Hamano 提交于
* jn/maint-plug-leak: write-tree: Avoid leak when index refers to an invalid object read-tree: stop leaking tree objects core: Stop leaking ondisk_cache_entrys
-
由 Junio C Hamano 提交于
* jl/submodule-ignore-diff: Add tests for the diff.ignoreSubmodules config option Add the 'diff.ignoreSubmodules' config setting Submodules: Use "ignore" settings from .gitmodules too for diff and status Submodules: Add the new "ignore" config option for diff and status Conflicts: diff.c
-
由 Junio C Hamano 提交于
* ml/rebase-x-strategy: rebase: support -X to pass through strategy options
-
由 Junio C Hamano 提交于
* jn/fix-abbrev: examples/commit: use --abbrev for commit summary checkout, commit: remove confusing assignments to rev.abbrev archive: abbreviate substituted commit ids again
-
由 Junio C Hamano 提交于
* vs/doc-spell: Documentation: spelling fixes
-
由 Junio C Hamano 提交于
* jh/use-test-must-fail: Convert "! git" to "test_must_fail git"
-
由 Junio C Hamano 提交于
* jh/clean-exclude: Add test for git clean -e. Add -e/--exclude to git-clean.
-
由 Junio C Hamano 提交于
* kf/post-receive-sample-hook: post-receive-email: optional message line count limit
-
由 Junio C Hamano 提交于
* ab/report-corrupt-object-with-type: sha1_file: Show the the type and path to corrupt objects
-
由 Junio C Hamano 提交于
* jn/rebase-rename-am: rebase: protect against diff.renames configuration t3400 (rebase): whitespace cleanup Teach "apply --index-info" to handle rename patches t4150 (am): futureproof against failing tests t4150 (am): style fix
-
由 Junio C Hamano 提交于
* jn/fast-import-subtree: Teach fast-import to import subtrees named by tree id
-
由 Junio C Hamano 提交于
* ar/string-list-foreach: Convert the users of for_each_string_list to for_each_string_list_item macro Add a for_each_string_list_item macro
-
由 Junio C Hamano 提交于
* jh/graph-next-line: Enable custom schemes for column colors in the graph API Make graph_next_line() available in the graph.h API
-
由 Junio C Hamano 提交于
* tr/xsize-bits: xsize_t: check whether we lose bits
-
由 Junio C Hamano 提交于
* tc/checkout-B: builtin/checkout: handle -B from detached HEAD correctly builtin/checkout: learn -B builtin/checkout: reword hint for -b add tests for checkout -b
-
- 18 8月, 2010 1 次提交
-
-
由 David Aguilar 提交于
When mergetool is run without path limiters it loops over each entry in 'git ls-files -u'. This includes autoresolved paths. Teach mergetool to only merge files listed in 'rerere status' when rerere is enabled. There are some subtle but harmless changes in behavior. We now call cd_to_toplevel when no paths are given. We do this because 'rerere status' paths are always relative to the root. This is beneficial for the non-rerere use as well in that mergetool now runs against all unmerged files regardless of the current directory. This also slightly tweaks the output when run without paths to be more readable. The old output: Merging the files: foo bar baz The new output: Merging: foo bar baz Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 8月, 2010 3 次提交
-
-
由 Ævar Arnfjörð Bjarmason 提交于
Add a regression test for the git log -M --follow $diff_option bug introduced in v1.7.2-rc0~103^2~2, $diff_option being diff related options like -p, --stat, --name-only etc. Signed-off-by: NÆvar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 David D. Kilzer 提交于
Currently git-svn assumes that two tags created from the same revision will have the same repo url, so it uses a ref to the tag without checking that its url matches the current url. This causes issues when fetching an svn repo where a tag was created, deleted, and then recreated under the following circumstances: - Both tags were copied from the same revision. - Both tags had the same name. - Both tags had different repository paths. - [Optional] Both tags have a file with the same name but different content. When all four conditions are met, a checksum mismatch error occurs because the content of two files with the same path differs (see t/t9155--git-svn-fetch-deleted-tag.sh): Checksum mismatch: ChangeLog 065854.... expected: ce771b.... got: 9563fd.... When only the first three conditions are met, no error occurs but the tag in git matches the first (deleted) tag instead of the last (most recent) tag (see t/t9156-git-svn-fetch-deleted-tag-2.sh). The fix is to verify that the repo url for the ref matches the current url. If the urls do not match, then a "tail" is grown on the tag name by appending a dash and rechecking the new ref's repo url until either a matching repo url is found or a new tag is created. Signed-off-by: NDavid D. Kilzer <ddkilzer@kilzer.net> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 David D. Kilzer 提交于
Fix a regular expression used to remove the revision from the end of an svn tag or branch name. The regex did not account for any "tail" (dashes) that may have been added to the end of the tag name (which first appeared in v1.4.1-rc2~11). If not fixed, tags with names like "tags/mytag@5--@2" may be created. Signed-off-by: NDavid D. Kilzer <ddkilzer@kilzer.net> Acked-by: NEric Wong <normalperson@yhbt.net>
-