Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'cb/receive-pack-keep-errors' into maint * cb/receive-pack-keep-errors: do not override receive-pack errors
Junio C Hamano
Merge branch 'cb/transfer-no-progress' into maint * cb/transfer-no-progress: push/fetch/clone --no-progress suppresses progress output
Junio C Hamano
Merge branch 'jk/git-dir-lookup' into maint * jk/git-dir-lookup: standardize and improve lookup rules for external local repos
Junio C Hamano
Merge branch 'jc/diff-stat-scaler' into maint * jc/diff-stat-scaler: diff --stat: show bars of same length for paths with same amount of changes
Junio C Hamano
Merge branch 'zj/term-columns' into maint * zj/term-columns: pager: find out the terminal width before spawning the pager
Junio C Hamano
Merge branch 'cb/maint-rev-list-verify-object' into maint * cb/maint-rev-list-verify-object: git rev-list: fix invalid typecast
Junio C Hamano
Merge branch 'cb/maint-t5541-make-server-port-portable' into maint * cb/maint-t5541-make-server-port-portable: t5541: check error message against the real port number used
Junio C Hamano
Merge branch 'dp/i18n-libcharset' into maint * dp/i18n-libcharset: Makefile: introduce CHARSET_LIB to link with -lcharset
Junio C Hamano
Merge branch 'jk/grep-binary-attribute' into maint * jk/grep-binary-attribute: grep: pre-load userdiff drivers when threaded grep: load file data after checking binary-ness grep: respect diff attributes for binary-ness grep: cache userdiff_driver in grep_source grep: drop grep_buffer's "name" parameter convert git-grep to use grep_source interface grep: refactor the concept of "grep source" into an object grep: move sha1-reading mu…
Junio C Hamano
Merge branch 'nd/diffstat-gramnum' into maint * nd/diffstat-gramnum: Use correct grammar in diffstat summary line
Junio C Hamano
Merge branch 'nd/find-pack-entry-recent-cache-invalidation' into maint * nd/find-pack-entry-recent-cache-invalidation: find_pack_entry(): do not keep packed_git pointer locally sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
Junio C Hamano
Merge branch 'tt/profile-build-fix' into maint * tt/profile-build-fix: Makefile: fix syntax for older make Fix build problems related to profile-directed optimization
Junio C Hamano
Merge branch 'fc/zsh-completion' into maint * fc/zsh-completion: completion: simplify __gitcomp and __gitcomp_nl implementations completion: use ls -1 instead of rolling a loop to do that ourselves completion: work around zsh option propagation bug
Jehan Bing
Ignore SIGPIPE when running a filter driver If a filter is not defined or if it fails, git should behave as if the filter is a no-op passthru. However, if the filter exits before reading all the content, depending on the timing, git could be killed with SIGPIPE when it tries to write to the pipe connected to the filter. Ignore SIGPIPE while processing the filter to give us a chance to check the return value from a failed write, in order t…
Christian Hammerl
completion: Allow dash as the first character for __git_ps1 If the argument for `__git_ps1` begins with a dash, `printf` tries to interpret it as an option which results in an error message. The problem is solved by adding '--' before the argument to tell `printf` to not interpret the following argument as an option. Adding '--' directly to the argument does not help because the argument is enclosed by double quotes. Signed-off-by: Christian Hammerl <info…
Junio C Hamano
Update draft release notes to 1.7.9.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
jszakmeister
configure: don't use -lintl when there is no gettext support The current configure script uses -lintl if gettext is not found in the C library, but does so before checking if there is libintl.h available in the first place, in which case we would later define NO_GETTEXT. Instead, check for the existence of libintl.h first. Only when libintl.h exists and libintl is not in libc, ask for -lintl. Signed-off-by: John Szakmeister <john@szakmeister.net> Signed-o…
Philip Jägenstedt
remote: fix set-branches usage and documentation The canonical order of command line arguments is always to have dashed commands before other parameters, but the "git remote set-branches" subcommand was described to take "name" before an optional "--add". Signed-off-by: Philip Jägenstedt <philip@foolip.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narębski
gitweb: Fix 'grep' search for multiple matches in file Commit ff7f218 (gitweb: Fix file links in "grep" search, 2012-01-05), added $file_href variable, to reduce duplication and have the fix applied in single place. Unfortunately it made variable defined inside the loop, not taking into account the fact that $file_href was set only if file changed. Therefore for files with multiple matches $file_href was undefined for second and subsequent matches. …
Junio C Hamano
refresh_index: do not show unmerged path that is outside pathspec When running "git add --refresh <pathspec>", we incorrectly showed the path that is unmerged even if it is outside the specified pathspec, even though we did honor pathspec and refreshed only the paths that matched. Note that this cange does not affect "git update-index --refresh"; for hysterical raisins, it does not take a pathspec (it takes real paths) and more importantly itss command line opt…
Jakub Narębski
gitweb: Fix "heads" view when there is no current branch In a repository whose HEAD points to an unborn branch with no commits, "heads" view and "summary" view (which shows what is shown in "heads" view) compared the object names of commits at the tip of branches with the output from "git rev-parse HEAD", which caused comparison of a string with undef and resulted in a warning in the server log. This can happen if non-bare repository (with default 'mas…
Junio C Hamano
Update draft release notes to 1.7.9.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/checkout-out-of-unborn' into maint * jc/checkout-out-of-unborn: git checkout -b: allow switching out of an unborn branch
Junio C Hamano
Merge branch 'jc/maint-mailmap-output' into maint * jc/maint-mailmap-output: mailmap: always return a plain mail address from map_user()
Junio C Hamano
Merge branch 'jk/prompt-fallback-to-tty' into maint * jk/prompt-fallback-to-tty: prompt: fall back to terminal if askpass fails prompt: clean up strbuf usage
Junio C Hamano
Merge branch 'jn/gitweb-search-utf-8' into maint * jn/gitweb-search-utf-8: gitweb: Allow UTF-8 encoded CGI query parameters and path_info
Junio C Hamano
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint * jc/maint-commit-ignore-i-t-a: commit: ignore intent-to-add entries instead of refusing Conflicts: cache-tree.c
Junio C Hamano
Merge branch 'mm/empty-loose-error-message' into maint * mm/empty-loose-error-message: fsck: give accurate error message on empty loose object files
Junio C Hamano
Merge branch 'nk/ctype-for-perf' into maint * nk/ctype-for-perf: ctype: implement islower/isupper macro ctype.c only wants git-compat-util.h
Junio C Hamano
Merge branch 'jx/i18n-more-marking' into maint * jx/i18n-more-marking: i18n: format_tracking_info "Your branch is behind" message i18n: git-commit whence_s "merge/cherry-pick" message
  1. Prev
  2. Next