- 10 11月, 2012 7 次提交
-
-
由 Jeff King 提交于
* fc/completion-send-email-with-format-patch: completion: add format-patch options to send-email
-
由 Jeff King 提交于
Cleanups to prepare for mo/cvs-server-updates. * mo/cvs-server-cleanup: Use character class for sed expression instead of \s cvsserver status: provide real sticky info cvsserver: cvs add: do not expand directory arguments cvsserver: use whole CVS rev number in-process; don't strip "1." prefix cvsserver: split up long lines in req_{status,diff,log} cvsserver: clean up client request handler map comments cvsserver: remove unused functions _headrev and gethistory cvsserver update: comment about how we shouldn't remove a user-modified file cvsserver: add comments about database schema/usage cvsserver: removed unused sha1Or-k mode from kopts_from_path cvsserver t9400: add basic 'cvs log' test
-
由 Jeff King 提交于
"git send-email --compose" can let the user create a non-ascii cover letter message, but there was not a way to mark it with appropriate content type before sending it out. Further updates fix subject quoting. * km/send-email-compose-encoding: git-send-email: add rfc2047 quoting for "=?" git-send-email: introduce quote_subject() git-send-email: skip RFC2047 quoting for ASCII subjects git-send-email: use compose-encoding for Subject git-send-email: introduce compose-encoding
-
由 Jeff King 提交于
Fixes many rfc2047 quoting issues in the output from format-patch. * js/format-2047: format-patch tests: check quoting/encoding in To: and Cc: headers format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch: make rfc2047 encoding more strict format-patch: introduce helper function last_line_length() format-patch: do not wrap rfc2047 encoded headers too late format-patch: do not wrap non-rfc2047 headers too early utf8: fix off-by-one wrapping of text
-
由 Jeff King 提交于
When "update-ref -d --no-deref SYM" tried to delete a symbolic ref SYM, it incorrectly locked the underlying reference pointed by SYM, not the symbolic ref itself. * rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target
-
由 Jeff King 提交于
Start laying the foundation to build the "wildmatch" after we can agree on its desired semantics. * nd/attr-match-optim-more: attr: more matching optimizations from .gitignore gitignore: make pattern parsing code a separate function exclude: split pathname matching code into a separate function exclude: fix a bug in prefix compare optimization exclude: split basename matching code into a separate function exclude: stricten a length check in EXC_FLAG_ENDSWITH case
-
由 Jeff King 提交于
Cleans up some code and avoids a potential bug. * mh/maint-parse-dirstat-fix: parse_dirstat_params(): use string_list to split comma-separated string
-
- 04 11月, 2012 11 次提交
-
-
由 Jeff King 提交于
* tj/maint-doc-commit-sign: Add -S, --gpg-sign option to manpage of "git commit"
-
由 Jeff King 提交于
* pp/maint-doc-pager-config: Documentation: improve the example of overriding LESS via core.pager
-
由 Jeff King 提交于
* km/maint-doc-git-reset: doc: git-reset: make "<mode>" optional
-
由 Jeff King 提交于
* tb/maint-t9200-case-insensitive: Fix t9200 on case insensitive file systems
-
由 Jeff King 提交于
* rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access
-
由 Jeff King 提交于
* gb/maint-doc-svn-log-window-size: Document git-svn fetch --log-window-size parameter
-
由 Jeff King 提交于
* sz/maint-submodule-reference-arg: submodule add: fix handling of --reference=<repo> option
-
由 Jeff King 提交于
Minor message fixes for the configure script. * sl/maint-configure-messages: configure: fix some output message
-
由 Jeff King 提交于
The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace
-
由 Jeff King 提交于
Avoids spewing error messages when using "pull --rebase" on a detached HEAD. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head
-
由 Jeff King 提交于
We long ago hyphenated "remote-tracking branch"; this catches some new instances added since then. * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch
-
- 29 10月, 2012 12 次提交
-
-
由 Tom Jones 提交于
git commit -S, --gpg-sign was mentioned in the program's help message, but not in the manpage. This adds an equivalent entry for the option in the manpage. Signed-off-by: NTom Jones <tom@oxix.org> Signed-off-by: NJeff King <peff@peff.net>
-
由 Jeff King 提交于
A symbolic ref refs/heads/SYM was not correctly removed with "git branch -d SYM"; the command removed the ref pointed by SYM instead. * rs/branch-del-symref: branch: show targets of deleted symrefs, not sha1s branch: skip commit checks when deleting symref branches branch: delete symref branch, not its target branch: factor out delete_branch_config() branch: factor out check_branch_commit()
-
由 Jeff King 提交于
Allow an earlier "--short" option on the command line to be countermanded with the "--long" option for "git status" and "git commit". * nd/status-long: status: add --long output format option
-
由 Jeff King 提交于
Refactoring to avoid code duplication in shell scripts. * jk/sh-setup-in-filter-branch: filter-branch: use git-sh-setup's ident parsing functions git-sh-setup: refactor ident-parsing functions
-
由 Jeff King 提交于
"git grep -e pattern <tree>" asked the attribute system to read "<tree>:.gitattributes" file in the working tree, which was nonsense. * nd/grep-true-path: grep: stop looking at random places for .gitattributes
-
由 Jeff King 提交于
Further clean-up to the http codepath that picks up results after cURL library is done with one request slot. * jk/maint-http-init-not-in-result-handler: http: do not set up curl auth after a 401 remote-curl: do not call run_slot repeatedly
-
由 Jeff King 提交于
"git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. The early part of this series is a fix for it; the latter part teaches log to respect the grep.* configuration. * jc/grep-pcre-loose-ends: log: honor grep.* configuration log --grep: accept --basic-regexp and --perl-regexp log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable
-
由 Jeff King 提交于
If you remove a submodule, in order to keep the repository so that "git checkout" to an older commit in the superproject history can resurrect the submodule, the real repository will stay in $GIT_DIR of the superproject. A later "git submodule add $path" to add a different submodule at the same path will fail. Diagnose this case a bit better, and if the user really wants to add an unrelated submodule at the same path, give the "--name" option to give it a place in $GIT_DIR of the superproject that does not conflict with the original submodule. * jl/submodule-add-by-name: submodule add: Fail when .git/modules/<name> already exists unless forced Teach "git submodule add" the --name option
-
由 Jeff King 提交于
"git rm submodule" cannot blindly remove a submodule directory as its working tree may have local changes, and worse yet, it may even have its repository embedded in it. Teach it some special cases where it is safe to remove a submodule, specifically, when there is no local changes in the submodule working tree, and its repository is not embedded in its working tree but is elsewhere and uses the gitfile mechanism to point at it. * jl/submodule-rm: submodule: teach rm to remove submodules unless they contain a git directory
-
由 Michael Haggerty 提交于
Use string_list_split_in_place() to split the comma-separated parameters string. This simplifies the code and also fixes a bug: the old code made calls like memcmp(p, "lines", p_len) which needn't work if p_len is different than the length of the constant string (and could illegally access memory if p_len is larger than the length of the constant string). When p_len was less than the length of the constant string, the old code would have allowed some abbreviations to be accepted (e.g., "cha" for "changes") but this seems to have been a bug rather than a feature, because (1) it is not documented; (2) no attempt was made to handle ambiguous abbreviations, like "c" for "changes" vs "cumulative". Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJeff King <peff@peff.net>
-
由 Patrick Palka 提交于
You can override an option set in the LESS variable by simply prefixing the command line option with `-+`. This is more robust than the previous example if the default LESS options are to ever change. Signed-off-by: NPatrick Palka <patrick@parcs.ath.cx> Signed-off-by: NJeff King <peff@peff.net>
-
由 Krzysztof Mazur 提交于
The git-reset's "<mode>" is an optional argument, however it was documented as required. The "<mode>" is documented as one of: --soft, --mixed, --hard, --merge or --keep, so "<mode>" should be used instead of "--<mode>". Signed-off-by: NKrzysztof Mazur <krzysiek@podlesie.net> Signed-off-by: NJeff King <peff@peff.net>
-
- 28 10月, 2012 2 次提交
-
-
由 Torsten Bögershausen 提交于
t9200 defines $CVSROOT where cvs should init its repository $CVSROOT is set to $PWD/cvsroot. cvs init is supposed to create the repository inside $PWD/cvsroot/CVSROOT "cvs init" (e.g. version 1.11.23) checks if the last element of the path is "CVSROOT", and if a directory with e.g. $PWD/cvsroot/CVSROOT already exists. For such a $CVSROOT cvs refuses to init a repository here: "Cannot initialize repository under existing CVSROOT: On a case insenstive file system cvsroot and CVSROOT are the same directories and t9200 fails. Solution: use $PWD/tmpcvsroot instead of cvsroot $PWD/cvsroot Signed-off-by: NTorsten Bögershausen <tboegi@web.de> Signed-off-by: NJeff King <peff@peff.net>
-
由 Romain Francoise 提交于
AddressSanitizer (http://clang.llvm.org/docs/AddressSanitizer.html) complains of a one-byte buffer underflow in parse_name_and_email() while running the test suite. And indeed, if one of the lines in the mailmap begins with '<', we dereference the address just before the beginning of the buffer when looking for whitespace to remove, before checking that we aren't going too far. So reverse the order of the tests to make sure that we don't read outside the buffer. Signed-off-by: NRomain Francoise <romain@orebokech.com> Signed-off-by: NJeff King <peff@peff.net>
-
- 26 10月, 2012 3 次提交
-
-
由 Stefan Zager 提交于
Doing a shift here is wrong because there is no extra argument to consume when "--reference=<repo>" is used (note the '=' instead of a space). Signed-off-by: NStefan Zager <szager@google.com> Signed-off-by: NJeff King <peff@peff.net>
-
由 Gunnlaugur Þór Briem 提交于
The --log-window-size parameter to git-svn fetch is undocumented. Minimally describe what it does and why the user might change it. Signed-off-by: NGunnlaugur Þór Briem <gunnlaugur@gmail.com> Signed-off-by: NJeff King <peff@peff.net>
-
由 Ben Walton 提交于
Sed on Mac OS X doesn't handle \s in a sed expressions so use a more portable character set expression instead. Signed-off-by: NBen Walton <bdwalton@gmail.com> Signed-off-by: NJeff King <peff@peff.net>
-
- 25 10月, 2012 5 次提交
-
-
由 Stefano Lattarini 提交于
Before this change, output from ./configure could contain botched wording like this: checking Checking for POSIX Threads with '-pthread'... yes instead of the intended: checking for POSIX Threads with '-pthread'... yes Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJeff King <peff@peff.net>
-
由 Philip Oakley 提交于
Signed-off-by: NPhilip Oakley <philipoakley@iee.org> Signed-off-by: NJeff King <peff@peff.net>
-
由 Matthieu Moy 提交于
This change was already done by 0e615b25 (Matthieu Moy, Tue Nov 2 2010, Replace "remote tracking" with "remote-tracking"), but new instances of remote tracking (without dash) were introduced in the meantime. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJeff King <peff@peff.net>
-
由 Jeff King 提交于
* jk/strbuf-detach-always-non-null: strbuf: always return a non-NULL value from strbuf_detach
-
由 Jeff King 提交于
* js/mingw-fflush-errno: maybe_flush_or_die: move a too-loose Windows specific error
-