Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'dm/pack-objects-update' * dm/pack-objects-update: pack-objects: don't traverse objects unnecessarily pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: use unsigned int for counter and offset values pack-objects: mark add_to_write_order() as inline
Junio C Hamano
Merge branch 'nd/pretty-commit-log-message' * nd/pretty-commit-log-message: pretty.c: use original commit message if reencoding fails pretty.c: free get_header() return value
Ted Percival
svn: Quote repository root in regex match Fixes a problem matching repository URLs, especially those with a '+' in the URL, such as svn+ssh:// URLs. Parts of the URL were interpreted as special characters by the regex matching. Signed-off-by: Ted Percival <ted.percival@quest.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Erik Faye-Lund
mingw: poll.h is no longer in sys/ Earlier we moved this header file in the code but forgot to update the Makefile that refers to it. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pat Thoyts
t7511: avoid use of reserved filename on Windows. PRN is a special filename on Windows to send data to the printer. As this is generated during test 3 substitute an alternate prefix to avoid this. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.8-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.8-rc0
Junio C Hamano
Merge branch 'jk/git-tricks' * jk/git-tricks: completion: match ctags symbol names in grep patterns contrib: add git-jump script contrib: add diff highlight script
Erik Faye-Lund
upload-archive: use start_command instead of fork The POSIX-function fork is not supported on Windows. Use our start_command API instead. As this is the last call-site that depends on the fork-stub in compat/mingw.h, remove that as well. Add an undocumented flag to git-archive that tells it that the action originated from a remote, so features can be disabled. Thanks to Jeff King for work on this part. Remove the NOT_MINGW-prereq for t5000, as…
Erik Faye-Lund
compat/win32/poll.c: upgrade from upstream poll.c is updated from revision adc3a5b in git://git.savannah.gnu.org/gnulib.git The changes are applied with --whitespace=fix to reduce noise. poll.h is not upgraded, because the most recent version now contains template-stuff that breaks compilation for us. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.c…
Erik Faye-Lund
mingw: move poll out of sys-folder Both XSI and upstream Gnulib versions expects to find poll.h at the root of some include path, not inside the sys-folder. This helps us when upgrading Gnulib. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
(squash) test for previous Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sebastian Schuberth
blame.c: Properly initialize strbuf after calling, textconv_object() For a plain string where only the length is known, strbuf.alloc needs to be initialized to the length. Otherwise strbuf.alloc is 0 and a later call to strbuf_setlen() will fail. This bug surfaced when calling git blame under Windows on a *.doc file. The *.doc file is converted to plain text by antiword via the textconv mechanism. However, the plain text returned by antiword contains DOS line endi…
Junio C Hamano
Update draft release notes to 1.7.8 Getting very close to -rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'sn/complete-bash-wo-process-subst' * sn/complete-bash-wo-process-subst: completion: fix issue with process substitution not working on Git for Windows
Junio C Hamano
Merge branch 'rj/gitweb-clean-js' * rj/gitweb-clean-js: gitweb/Makefile: Remove static/gitweb.js in the clean target
Junio C Hamano
Merge branch 'js/grep-mutex' * js/grep-mutex: builtin/grep: simplify lock_and_read_sha1_file() builtin/grep: make lock/unlock into static inline functions git grep: be careful to use mutexes only when they are initialized
Junio C Hamano
Merge branch 'maint' * maint: clone: Quote user supplied path in a single quote pair read-cache.c: fix index memory allocation
Junio C Hamano
Merge branch 'rs/maint-estimate-cache-size' into maint * rs/maint-estimate-cache-size: read-cache.c: fix index memory allocation
Richard Hartmann
clone: Quote user supplied path in a single quote pair Without this patch, $ git clone foo . results in this: Cloning into .... done. With it: Cloning into '.'... done. Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: make the sample pre-commit hook script reject names with newlines, too
Junio C Hamano
Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'tc/submodule-clone-name-detection' * tc/submodule-clone-name-detection: submodule::module_clone(): silence die() message from module_name() submodule: whitespace fix
Junio C Hamano
Merge branch 'lh/gitweb-site-html-head' * lh/gitweb-site-html-head: gitweb: provide a way to customize html headers
Junio C Hamano
Merge branch 'mm/mediawiki-author-fix' * mm/mediawiki-author-fix: git-remote-mediawiki: don't include HTTP login/password in author
Junio C Hamano
Merge branch 'jn/libperl-git-config' * jn/libperl-git-config: Add simple test for Git::config_path() in t/t9700-perl-git.sh libperl-git: refactor Git::config_*
Junio C Hamano
Merge branch 'jm/maint-gitweb-filter-forks-fix' * jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks
Junio C Hamano
Merge branch 'cn/fetch-prune' * cn/fetch-prune: fetch: treat --tags like refs/tags/*:refs/tags/* when pruning fetch: honor the user-provided refspecs when pruning refs remote: separate out the remote_find_tracking logic into query_refspecs t5510: add tests for fetch --prune fetch: free all the additional refspecs Conflicts: remote.c
Junio C Hamano
Merge branch 'jn/gitweb-highlite-sanitise' into maint * jn/gitweb-highlite-sanitise: gitweb: Strip non-printable characters from syntax highlighter output
Junio C Hamano
Merge branch 'jk/argv-array' into maint * jk/argv-array: run_hook: use argv_array API checkout: use argv_array API bisect: use argv_array API quote: provide sq_dequote_to_argv_array refactor argv_array into generic code quote.h: fix bogus comment add sha1_array API docs
Junio C Hamano
Merge branch 'jc/run-receive-hook-cleanup' into maint * jc/run-receive-hook-cleanup: refactor run_receive_hook()
  1. Prev
  2. Next