Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'cn/config-missing-path' into maint * cn/config-missing-path: config: don't segfault when given --path with a missing value
Junio C Hamano
Merge branch 'jk/maint-gitweb-xss' into maint Fixes an XSS vulnerability in gitweb. * jk/maint-gitweb-xss: gitweb: escape html in rss title
Marc Khouzam
Completion must sort before using uniq The user can be presented with invalid completion results when trying to complete a 'git checkout' command. This can happen when using a branch name prefix that matches multiple remote branches. For example, if available branches are: master remotes/GitHub/maint remotes/GitHub/master remotes/origin/maint remotes/origin/master When performing completion on 'git checkout ma' the user wi…
Nguyễn Thái Ngọc Duy
compat/fnmatch: fix off-by-one character class's length check Character class "xdigit" is the only one that hits 6 character limit defined by CHAR_CLASS_MAX_LENGTH. All other character classes are 5 character long and therefore never caught by this. This should make xdigit tests in t3070 pass on Windows. Reported-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Further preparation for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mg/maint-pull-suggest-upstream-to' into maint * mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface
Junio C Hamano
Merge branch 'mm/maint-doc-commit-edit' into maint * mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
Junio C Hamano
Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint * as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description
Junio C Hamano
Merge branch 'rs/lock-correct-ref-during-delete' into maint * rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target
Junio C Hamano
Merge branch 'rf/maint-mailmap-off-by-one' into maint * rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access
Junio C Hamano
Merge branch 'jk/maint-diff-grep-textconv' into maint "git diff -G<pattern>" did not honor textconv filter when looking for changes. * jk/maint-diff-grep-textconv: diff_grep: use textconv buffers for add/deleted files
Junio C Hamano
Merge branch 'js/format-2047' into maint Various rfc2047 quoting issues around a non-ASCII name on the From: line in the output from format-patch have been corrected. * 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()…
Junio C Hamano
Start preparing for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'sz/maint-curl-multi-timeout' into maint Sometimes curl_multi_timeout() function suggested a wrong timeout value when there is no file descriptors to wait on and the http transport ended up sleeping for minutes in select(2) system call. A workaround has been added for this. * sz/maint-curl-multi-timeout: Fix potential hang in https handshake
Junio C Hamano
Merge branch 'po/maint-refs-replace-docs' into maint The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace
Junio C Hamano
Merge branch 'ph/pull-rebase-detached' into maint "git pull --rebase" run while the HEAD is detached tried to find the upstream branch of the detached HEAD (which by definition does not exist) and emitted unnecessary error messages. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head
Junio C Hamano
Merge branch 'mm/maint-doc-remote-tracking' into maint Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch
Junio C Hamano
Merge branch 'rs/branch-del-symref' into maint 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_comm…
Junio C Hamano
Merge branch 'nd/grep-true-path' into maint "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
Junio C Hamano
Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint "git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. * 'jc/grep-pcre-loose-ends' (early part): 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 con…
Junio C Hamano
Merge branch 'da/mergetools-p4' into maint "git mergetool" feeds /dev/null as a common ancestor when dealing with an add/add conflict, but p4merge backend cannot handle it. Work it around by passing a temporary empty file. * da/mergetools-p4: mergetools/p4merge: Handle "/dev/null"
Junio C Hamano
Merge branch 'jc/test-say-color-avoid-echo-escape' into maint The "say" function in the test scaffolding incorrectly allowed "echo" to interpret "\a" as if it were a C-string asking for a BEL output. * jc/test-say-color-avoid-echo-escape: test-lib: Fix say_color () not to interpret \a\b\c in the message
Junio C Hamano
Merge branch 'bw/config-lift-variable-name-length-limit' into maint The configuration parser had an unnecessary hardcoded limit on variable names that was not checked consistently. * bw/config-lift-variable-name-length-limit: Remove the hard coded length limit on variable names in config files
Carlos Martín Nieto
config: don't segfault when given --path with a missing value When given a variable without a value, such as '[section] var' and asking git-config to treat it as a path, git_config_pathname returns an error and doesn't modify its output parameter. show_config assumes that the call is always successful and sets a variable to indicate that vptr should be freed. In case of an error however, trying to do this will cause the program to be killed, as it's pointing…
Jeff King
checkout: print a message when switching unborn branches When we switch to a new branch using checkout, we usually output a message indicating what happened. However, when we switch from an unborn branch to a new branch, we do not print anything, which may leave the user wondering what happened. The reason is that the unborn branch is a special case (see abe1998), and does not follow the usual switch_branches code path. Let's add a similar informationa…
Jeff King
gitweb: escape html in rss title The title of an RSS feed is generated from many components, including the filename provided as a query parameter, but we failed to quote it. Besides showing the wrong output, this is a vector for XSS attacks. Signed-off-by: Jeff King <peff@peff.net>
Eric Raymond
doc/fast-import: clarify how content states are built Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Jeff King <peff@peff.net>
Richard Hubbell
gitweb.perl: fix %highlight_ext mappings When commit 592ea41 refactored the list of extensions for syntax highlighting, it failed to take into account perl's operator precedence within lists. As a result, we end up creating a dictionary of one-to-one elements when the intent was to map mutliple related types to one main type (e.g., bash, ksh, zsh, and sh should all map to sh since they share similar syntax, but we ended up just mapping "…
Pete Wyckoff
git p4: RCS expansion should not span newlines This bug was introduced in cb585a9 (git-p4: keyword flattening fixes, 2011-10-16). The newline character is indeed special, and $File$ expansions should not try to match across multiple lines. Based-on-patch-by: Chris Goard <cgoard@gmail.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Jeff King <peff@peff.net>
Michael J Gruber
push/pull: adjust missing upstream help text to changed interface In case of a missing upstream, the git-parse-remote script suggests: If you wish to set tracking information for this branch you can do so with: git branch --set-upstream nsiv2 origin/<branch> But --set-upstream is deprectated. Change the suggestion to: git branch --set-upstream-to=origin/<branch> nsiv2 Reported-by: Jeroen van der Ham <vdham@uva.nl> Signed-off-by: Michael J Gruber <gi…
  1. Prev
  2. Next