Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'ss/mergetools-tortoise' into jch Update mergetools to work better with newer merge helper tortoise ships. Will merge to 'next'. * ss/mergetools-tortoise: mergetools: teach tortoisemerge to handle filenames with SP correctly mergetools: support TortoiseGitMerge
Branches
pu
Jonathan Nieder
Makefile: explicitly set target name for autogenerated dependencies "gcc -MF depfile -MMD -MP -c -o path/to/file.o" produces a makefile snippet named "depfile" describing what files are needed to build the target given by "-o". When ccache versions before v3.0pre0~187 (Fix handling of the -MD and -MDD options, 2009-11-01) run, they execute gcc -MF depfile -MMD -MP -E instead to get the final content for hashing. Notice that the "-c -o" combination is replaced…
Sven Strickroth
mergetools: teach tortoisemerge to handle filenames with SP correctly TortoiseGitMerge, unlike TortoiseMerge, can be told to handle paths with spaces in them by using -option "$FILE" (not -option:"$FILE", which does not work for such paths) syntax. This change was necessary because of MSYS path mangling [1], the ":" after the "base" etc. arguments to TortoiseMerge caused the whole argument instead of just the file name to be quoted in case of file names with spaces…
John Keeping
Rename {git- => git}remote-helpers.txt When looking up a topic via "git help <topic>", git-help prepends "git-" to topics that are the names of commands (either builtin or found on the path) and "git" (no hyphen) to any other topic name. "git-remote-helpers" is not the name of a command, so "git help remote-helpers" looks for "gitremote-helpers" and does not find it. Fix this by renaming "git-remote-helpers.txt" to "gitremote-helpers…
Stephen Boyd
run-command: be more informative about what failed While debugging an error with verify_signed_buffer() the error messages from run-command weren't very useful: error: cannot create pipe for gpg: Too many open files error: could not run gpg. because they didn't indicate *which* pipe couldn't be created. Print which pipe failed to be created in the error message so we can more easily debug similar problems in the future. For example, the abov…
Thomas Ackermann
Documentation: StGit is the right spelling, not StGIT They refer themselves as such at https://gna.org/projects/stgit/ Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation: describe the "repository" in repository-layout Update the introductory part and concisely explain how gitfile is handled, what it is used for and for what effect. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann
Documentation: add a description for 'gitfile' to glossary Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann
Documentation: do not use undefined terms git-dir and git-file We will add gitfile to the glossary in a separate commit. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann
Documentation: the name of the system is 'Git', not 'git' Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann
Documentation: avoid poor-man's small caps GIT In the earlier days, we used to spell the name of the system as GIT, to simulate as if it were typeset with capital G and IT in small caps. Later we stopped doing so at around 1.6.5 days. Let's stop doing so throughout the documentation. The name to refer to the whole system (and the concept it embodies) is "Git"; the command end-users type is "git". And document this in the coding guideline. …
Junio C Hamano
### match next
Branches
pu
Junio C Hamano
Merge branch 'pw/git-p4-on-cygwin' into jch Improve "git p4" on Cygwin. Will merge to 'master'. * pw/git-p4-on-cygwin: (21 commits) git p4: introduce gitConfigBool git p4: avoid shell when calling git config git p4: avoid shell when invoking git config --get-all git p4: avoid shell when invoking git rev-list git p4: avoid shell when mapping users git p4: disable read-only attribute before deleting git p4 test: use test_chmod…
Branches
pu
Junio C Hamano
Merge branch 'mp/complete-paths' into jch The completion script used to let the default completer to suggest pathnames, which gave too many irrelevant choices (e.g. "git add" would not want to add an unmodified path). Teach it to use a more git-aware logic to enumerate only relevant ones. This is logically the right thing to do, and we would really love to see people who have been involved in completion code to review and comment on the…
Branches
pu
Junio C Hamano
Merge branch 'jk/read-commit-buffer-data-after-free' into jch Clarify the ownership rule for commit->buffer field, which some callers incorrectly accessed without making sure it is populated. Will merge to 'master'. * jk/read-commit-buffer-data-after-free: logmsg_reencode: lazily load missing commit buffers logmsg_reencode: never return NULL commit: drop useless xstrdup of commit message
Branches
pu
Junio C Hamano
Merge branch 'jc/remove-treesame-parent-in-simplify-merges' into jch The --simplify-merges logic did not cull irrelevant parents from a merge that is otherwise not interesting with respect to the paths we are following. This touches a fairly core part of the revision traversal infrastructure; even though I think this change is correct, please report immediately if you find any unintended side effect. Will merge to 'next'. * jc/remove-treesame-parent-in-simplify-…
Branches
pu
Junio C Hamano
Merge branch 'jk/remote-helpers-in-python-3' into jch Prepare remote-helper test written in Python to be run with Python3. Will merge to 'master'. * jk/remote-helpers-in-python-3: git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" git-remote-testpy: fix path hashing on Python 3 git-remote-testpy: call print as a function git-remote-testpy: don't do unbuffered text I/O git-remote-testpy: hash bytes explicitly svn-fe: allow svnrdu…
Branches
pu
Junio C Hamano
Merge branch 'mm/add-u-A-sans-pathspec' into jch Forbid "git add -u" and "git add -A" without pathspec run from a subdirectory, to train people to type "." (or ":/") to make the choice of default does not matter. Will merge to 'master'. * mm/add-u-A-sans-pathspec: add: warn when -u or -A is used without pathspec
Branches
pu
Junio C Hamano
Merge branch 'jc/push-reject-reasons' into jch Improve error and advice messages given locally when "git push" refuses when it cannot compute fast-forwardness by separating these cases from the normal "not a fast-forward; merge first and push again" case. Will merge to 'master'. * jc/push-reject-reasons: push: finishing touches to explain REJECT_ALREADY_EXISTS better push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE push: furth…
Branches
pu
Junio C Hamano
Merge branch 'jk/config-parsing-cleanup' into jch Configuration parsing for tar.* configuration variables were broken. Introduce a new config-keyname parser API to make the callers much less error prone. Will merge to 'master'. * jk/config-parsing-cleanup: reflog: use parse_config_key in config callback help: use parse_config_key for man config submodule: simplify memory handling in config parsing submodule: use parse_config_key when pa…
Branches
pu
Junio C Hamano
Merge branch 'jc/push-2.0-default-to-simple' into jch Will cook in 'next' until Git 2.0 ;-). * jc/push-2.0-default-to-simple: t5570: do not assume the "matching" push is the default t5551: do not assume the "matching" push is the default t5550: do not assume the "matching" push is the default doc: push.default is no longer "matching" push: switch default from "matching" to "simple" t9401: do not assume the "matching" push is the default …
Branches
pu
Junio C Hamano
Merge branch 'jc/custom-comment-char' into jch An illustration to show codepaths that need to be touched to change the hint lines in the edited text to begin with something other than '#'. This is half my work and half by Ralf Thielow. There may still be leftover '#' lurking around, though. My "git grep" says C code should be already fine, but git-rebase--interactive.sh could be converted (it should not matter, as the file is not really a f…
Branches
pu
Junio C Hamano
Update draft release notes to 1.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/edit-branch-desc-while-detached' Attempt to "branch --edit-description" an existing branch, while being on a detached HEAD, errored out. * nd/edit-branch-desc-while-detached: branch: no detached HEAD check when editing another branch's description
Junio C Hamano
Merge branch 'jk/gc-auto-after-fetch' Help "fetch only" repositories that do not trigger "gc --auto" often enough. * jk/gc-auto-after-fetch: fetch-pack: avoid repeatedly re-scanning pack directory fetch: run gc --auto after fetching
Junio C Hamano
Merge branch 'bc/git-p4-for-python-2.4' With small updates to remove dependency on newer features of Python, keep git-p4 usable with older Python. * bc/git-p4-for-python-2.4: INSTALL: git-p4 does not support Python 3 git-p4.py: support Python 2.4 git-p4.py: support Python 2.5
Junio C Hamano
Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. This is to fix it. * jn/do-not-drop-username-when-reading-from-etc-mailname: ident: do not drop username when reading from /etc/mailname
Junio C Hamano
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' Warn people that other tools are more recommendable over cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport will not work with cvsps3. * jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated
Junio C Hamano
Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' Scripts to test bash completion was inherently flaky as it was affected by whatever random things the user may have on $PATH. * jc/do-not-let-random-file-interfere-with-completion-tests: t9902: protect test from stray build artifacts
Junio C Hamano
Merge branch 'as/test-cleanup' * as/test-cleanup: t7102 (reset): don't hardcode SHA-1 in expected outputs
  1. Prev
  2. Next