- 19 1月, 2017 22 次提交
-
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Retire long unused/unmaintained gitview from the contrib/ area. * sb/remove-gitview: doc: git-gui browser does not default to HEAD doc: gitk: add the upstream repo location doc: gitk: remove gitview reference contrib: remove gitview
-
由 Junio C Hamano 提交于
Adjust documentation to help AsciiDoctor render better while not breaking the rendering done by AsciiDoc. * js/asciidoctor-tweaks: asciidoctor: fix user-manual to be built by `asciidoctor` giteveryday: unbreak rendering with AsciiDoctor
-
由 Junio C Hamano 提交于
Code cleanup. * sb/unpack-trees-cleanup: unpack-trees: factor progress setup out of check_updates unpack-trees: remove unneeded continue unpack-trees: move checkout state into check_updates
-
由 Junio C Hamano 提交于
"git mergetool" without any pathspec on the command line that is run from a subdirectory became no-op in Git v2.11 by mistake, which has been fixed. * rh/mergetool-regression-fix: mergetool: fix running in subdir when rerere enabled mergetool: take the "-O" out of $orderfile t7610: add test case for rerere+mergetool+subdir bug t7610: spell 'git reset --hard' consistently t7610: don't assume the checked-out commit t7610: always work on a test-specific branch t7610: delete some now-unnecessary 'git reset --hard' lines t7610: run 'git reset --hard' after each test to clean up t7610: don't rely on state from previous test t7610: use test_when_finished for cleanup tasks t7610: move setup code to the 'setup' test case t7610: update branch names to match test number rev-parse doc: pass "--" to rev-parse in the --prefix example .mailmap: record canonical email for Richard Hansen
-
由 Junio C Hamano 提交于
The implementation of "real_path()" was to go there with chdir(2) and call getcwd(3), but this obviously wouldn't be usable in a threaded environment. Rewrite it to manually resolve relative paths including symbolic links in path components. * bw/realpath-wo-chdir: real_path: set errno when max number of symlinks is exceeded real_path: prevent redefinition of MAXSYMLINKS
-
由 Junio C Hamano 提交于
Typing ^C to pager, which usually does not kill it, killed Git and took the pager down as a collateral damage in certain process-tree structure. This has been fixed. * jk/execv-dashed-external: execv_dashed_external: wait for child on signal death execv_dashed_external: stop exiting with negative code execv_dashed_external: use child_process struct
-
由 Junio C Hamano 提交于
Build updates for Cygwin. * sp/cygwin-build-fixes: Makefile: put LIBS after LDFLAGS for imap-send Makefile: POSIX windres
-
由 Junio C Hamano 提交于
Running "git add a/b" when "a" is a submodule correctly errored out, but without a meaningful error message. * sb/pathspec-errors: pathspec: give better message for submodule related pathspec error
-
由 Junio C Hamano 提交于
Test cleanup. * pb/test-must-fail-is-for-git: t9813: avoid using pipes don't use test_must_fail with grep
-
由 Junio C Hamano 提交于
Code clean-up in the pathspec API. * bw/pathspec-cleanup: pathspec: rename prefix_pathspec to init_pathspec_item pathspec: small readability changes pathspec: create strip submodule slash helpers pathspec: create parse_element_magic helper pathspec: create parse_long_magic function pathspec: create parse_short_magic function pathspec: factor global magic into its own function pathspec: simpler logic to prefix original pathspec elements pathspec: always show mnemonic and name in unsupported_magic pathspec: remove unused variable from unsupported_magic pathspec: copy and free owned memory pathspec: remove the deprecated get_pathspec function ls-tree: convert show_recursive to use the pathspec struct interface dir: convert fill_directory to use the pathspec struct interface dir: remove struct path_simplify mv: remove use of deprecated 'get_pathspec()'
-
由 Junio C Hamano 提交于
"git push \\server\share\dir" has recently regressed and then fixed. A test has retroactively been added for this breakage. * js/mingw-test-push-unc-path: mingw: add a regression test for pushing to UNC paths
-
由 Junio C Hamano 提交于
Code cleanup. * sb/submodule-cleanup-export-git-dir-env: submodule.c: use GIT_DIR_ENVIRONMENT consistently
-
由 Junio C Hamano 提交于
"git <cmd> @{push}" on a detached HEAD used to segfault; it has been corrected to error out with a message. * km/branch-get-push-while-detached: branch_get_push: do not segfault when HEAD is detached
-
由 Junio C Hamano 提交于
"git rebase -i" with a recent update started showing an incorrect count when squashing more than 10 commits. * jk/rebase-i-squash-count-fix: rebase--interactive: count squash commits above 10 correctly
-
由 Junio C Hamano 提交于
"git blame --porcelain" misidentified the "previous" <commit, path> pair (aka "source") when contents came from two or more files. * jk/blame-fixes: blame: output porcelain "previous" header for each file blame: handle --no-abbrev blame: fix alignment with --abbrev=40
-
由 Junio C Hamano 提交于
"git archive" did not read the standard configuration files, and failed to notice a file that is marked as binary via the userdiff driver configuration. * jk/archive-zip-userdiff-config: archive-zip: load userdiff config
-
由 Junio C Hamano 提交于
It is natural that "git gc --auto" may not attempt to pack everything into a single pack, and there is no point in warning when the user has configured the system to use the pack bitmap, leading to disabling further "gc". * dt/disable-bitmap-in-auto-gc: repack: die on incremental + write-bitmap-index auto gc: don't write bitmaps for incremental repacks
-
由 Junio C Hamano 提交于
A recent updates to "git p4" was not usable for older p4 but it could be made to work with minimum changes. Do so. * ls/p4-retry-thrice: git-p4: do not pass '-r 0' to p4 commands
-
由 Junio C Hamano 提交于
"git rm" used to refuse to remove a submodule when it has its own git repository embedded in its working tree. It learned to move the repository away to $GIT_DIR/modules/ of the superproject instead, and allow the submodule to be deleted (as long as there will be no loss of local modifications, that is). * sb/submodule-rm-absorb: rm: absorb a submodules git dir before deletion submodule: rename and add flags to ok_to_remove_submodule submodule: modernize ok_to_remove_submodule to use argv_array submodule.h: add extern keyword to functions
-
由 Junio C Hamano 提交于
"git grep" has been taught to optionally recurse into submodules. * bw/grep-recurse-submodules: grep: search history of moved submodules grep: enable recurse-submodules to work on <tree> objects grep: optionally recurse into submodules grep: add submodules as a grep source type submodules: load gitmodules file from commit sha1 submodules: add helper to determine if a submodule is initialized submodules: add helper to determine if a submodule is populated real_path: canonicalize directory separators in root parts real_path: have callers use real_pathdup and strbuf_realpath real_path: create real_pathdup real_path: convert real_path_internal to strbuf_realpath real_path: resolve symlinks by hand
-
git://ozlabs.org/~paulus/gitk由 Junio C Hamano 提交于
* 'master' of git://ozlabs.org/~paulus/gitk: gitk: Remove translated message from comments gitk: ru.po: Update Russian translation gitk: Update copyright notice to 2016 gitk: Clear array 'commitinfo' on reload gitk: Remove closed file descriptors from $blobdifffd gitk: Turn off undo manager in the text widget gitk: Fix Japanese translation for "marked commit" gitk: Fix missing commits when using -S or -G gitk: Use explicit RGB green instead of "lime" gitk: Add Portuguese translation gitk: Makefile: create install bin directory gitk: Include commit title in branch dialog gitk: Allow checking out a remote branch gitk: Add a 'rename' option to the branch context menu
-
- 18 1月, 2017 18 次提交
-
-
由 David Aguilar 提交于
"make update-po" fails because a previously untranslated string has now been translated: Updating po/sv.po po/sv.po:1388: duplicate message definition... po/sv.po:380: ...this is the location of the first definition Remove the duplicate message definition. Reported-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Doc update. * mm/gc-safety-doc: git-gc.txt: expand discussion of races with other processes
-
由 Junio C Hamano 提交于
Doc update on fetching and pushing. * mm/push-social-engineering-attack-doc: doc: mention transfer data leaks in more places
-
由 Junio C Hamano 提交于
Code cleanup to avoid using redundant refspecs while fetching with the --tags option. * jt/fetch-no-redundant-tag-fetch-map: fetch: do not redundantly calculate tag refmap
-
由 Junio C Hamano 提交于
Doc update. * ls/filter-process: t0021: fix flaky test docs: warn about possible '=' in clean/smudge filter process values
-
由 Junio C Hamano 提交于
* kh/tutorial-grammofix: doc: omit needless "for" doc: make the intent of sentence clearer doc: add verb in front of command to run doc: add articles (grammar)
-
由 Junio C Hamano 提交于
* lr/doc-fix-cet: date-formats.txt: Typo fix
-
由 Junio C Hamano 提交于
Code cleanup. * sb/t3600-cleanup: t3600: slightly modernize style t3600: remove useless redirect
-
由 Junio C Hamano 提交于
* jk/readme-gmane-is-no-more: README: replace gmane link with public-inbox
-
由 Junio C Hamano 提交于
* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories
-
由 Junio C Hamano 提交于
* ls/t0021-fixup: t0021: minor filter process test cleanup
-
由 Junio C Hamano 提交于
Test code clean-up. * ak/lazy-prereq-mktemp: t7610: clean up foo.XXXXXX tmpdir
-
由 Junio C Hamano 提交于
Code simplification. * nd/qsort-in-merge-recursive: merge-recursive.c: use string_list_sort instead of qsort
-
由 Junio C Hamano 提交于
When the http server gives an incomplete response to a smart-http rpc call, it could lead to client waiting for a full response that will never come. Teach the client side to notice this condition and abort the transfer. An improvement counterproposal has failed. cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net> * dt/smart-http-detect-server-going-away: upload-pack: optionally allow fetching any sha1 remote-curl: don't hang when a server dies before any output
-
由 Junio C Hamano 提交于
A potential but unlikely buffer overflow in Windows port has been fixed. * mk/mingw-winansi-ttyname-termination-fix: mingw: consider that UNICODE_STRING::Length counts bytes
-