summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-19t2107: mark passing test as successLibravatar Jeff King1-1/+1
This failed on the branch where it was introduced, but was fixed by merging with 6e67619 (Merge branch 'jn/parse-options-extra'). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-12Merge branch 'jn/parse-options-extra'Libravatar Junio C Hamano7-198/+303
* jn/parse-options-extra: update-index: migrate to parse-options API setup: save prefix (original cwd relative to toplevel) in startup_info parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION parse-options: allow git commands to invent new option types parse-options: never suppress arghelp if LITERAL_ARGHELP is set parse-options: do not infer PARSE_OPT_NOARG from option type parse-options: sanity check PARSE_OPT_NOARG flag parse-options: move NODASH sanity checks to parse_options_check parse-options: clearer reporting of API misuse parse-options: Don't call parse_options_check() so much
2010-12-12Merge branch 'js/configurable-tab'Libravatar Junio C Hamano7-19/+190
* js/configurable-tab: Make the tab width used for whitespace checks configurable apply --whitespace=fix: fix tab-in-indent
2010-12-12Merge branch 'nd/maint-hide-checkout-index-from-error'Libravatar Junio C Hamano1-8/+8
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
2010-12-12Merge branch 'jn/gitweb-per-request-config'Libravatar Junio C Hamano2-3/+35
* jn/gitweb-per-request-config: gitweb: document $per_request_config better gitweb: selectable configurations that change with each request
2010-12-12Merge branch 'ef/help-cmd-prefix'Libravatar Junio C Hamano2-8/+41
* ef/help-cmd-prefix: help: always suggest common-cmds if prefix of cmd
2010-12-12Merge branch 'tc/http-urls-ends-with-slash'Libravatar Junio C Hamano9-40/+55
* tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&'
2010-12-12Merge branch 'tc/format-patch-p'Libravatar Junio C Hamano2-0/+25
* tc/format-patch-p: format-patch: page output with --stdout
2010-12-12Merge branch 'ef/win32-dirent'Libravatar Junio C Hamano7-248/+137
* ef/win32-dirent: win32: use our own dirent.h msvc: opendir: handle paths ending with a slash win32: dirent: handle errors msvc: opendir: do not start the search msvc: opendir: allocate enough memory msvc: opendir: fix malloc-failure Conflicts: Makefile
2010-12-12Merge branch 'mz/rebase-i-verify'Libravatar Junio C Hamano3-0/+9
* mz/rebase-i-verify: rebase: support --verify
2010-12-12Merge branch 'mz/rebase-abort-reflog-fix'Libravatar Junio C Hamano2-9/+22
* mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
2010-12-12Merge branch 'jk/maint-reflog-bottom'Libravatar Junio C Hamano3-2/+37
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
2010-12-12Merge branch 'jk/asciidoc-update'Libravatar Junio C Hamano6-29/+27
* jk/asciidoc-update: docs: default to more modern toolset
2010-12-12Merge branch 'mz/pull-rebase-rebased'Libravatar Junio C Hamano2-2/+15
* mz/pull-rebase-rebased: Use reflog in 'pull --rebase . foo'
2010-12-12Merge branch 'mz/maint-rebase-stat-config'Libravatar Junio C Hamano1-1/+2
* mz/maint-rebase-stat-config: rebase: only show stat if configured to true
2010-12-12Merge branch 'jn/git-cmd-h-bypass-setup'Libravatar Junio C Hamano14-0/+193
* jn/git-cmd-h-bypass-setup: update-index -h: show usage even with corrupt index merge -h: show usage even with corrupt index ls-files -h: show usage even with corrupt index gc -h: show usage even with broken configuration commit/status -h: show usage even with broken configuration checkout-index -h: show usage even in an invalid repository branch -h: show usage even in an invalid repository Conflicts: builtin/merge.c
2010-12-10Relnotes: remove items fixed on 'maint'Libravatar Junio C Hamano1-13/+0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Merge branch 'maint'Libravatar Junio C Hamano2-0/+35
2010-12-10Prepare for 1.7.3.4Libravatar Junio C Hamano2-1/+33
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Merge branch 'jk/maint-decorate-01-bool' into maintLibravatar Junio C Hamano2-2/+23
* jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
2010-12-10Merge branch 'mg/maint-tag-rfc1991' into maintLibravatar Junio C Hamano5-20/+88
* mg/maint-tag-rfc1991: tag: recognize rfc1991 signatures tag: factor out sig detection for tag display tag: factor out sig detection for body edits verify-tag: factor out signature detection t/t7004-tag: test handling of rfc1991 signatures
2010-12-10Merge branch 'ks/maint-getenv-fix' into maintLibravatar Junio C Hamano1-0/+1
* ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case
2010-12-10thread-utils.h: simplify the inclusionLibravatar Junio C Hamano4-12/+4
All files that include this header file use the same four line incantation: #ifndef NO_PTHREADS #include <pthread.h> #include "thread-utils.h" #endif Move the responsibility for that gymnastics to the header file from the files that include it. This approach makes it easier to later declare new services that are related to threading in thread-utils.h and have them available to all the threading code. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Makefile: transport-helper uses thread-utils.hLibravatar Jonathan Nieder1-2/+1
transport-helper.o gained a dependency on thread-utils.h in 7851b1e (remote-fd/ext: finishing touches after code review, 2010-11-17). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Add --force to git-send-email documentationLibravatar Alejandro R. Sedeño1-0/+3
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-09Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-4/+56
* git://git.bogomips.org/git-svn: t9143: do not fail when unhandled.log.gz is not created git-svn: allow the mergeinfo property to be set
2010-12-09Documentation/git.txt: update list of maintenance releasesLibravatar Junio C Hamano1-4/+8
Recently we have made 1.7.3.3, 1.7.2.4, 1.7.1.3 and 1.7.0.8. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10t9143: do not fail when unhandled.log.gz is not createdLibravatar Torsten Bögershausen1-3/+1
Do not depend on internal implementation details of svn, which right now uses perl to create a .gz file. So this test case will even work in the future, when svn changes its implementation. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Acked-by: Eric Wong <normalperson@yhbt.net>
2010-12-10git-svn: allow the mergeinfo property to be setLibravatar Steven Walter2-1/+55
As a first step towards preserving merges across dcommit, we need a mechanism to update the svn:mergeinfo property. [ew: fixed bashism and style issues in test case] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
2010-12-09Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
* maint: contrib/hooks/post-receive-email: fix return values from prep_for_email
2010-12-09Merge branch 'jn/ignore-doc' into maintLibravatar Junio C Hamano1-7/+23
* jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
2010-12-09Merge branch 'jn/cherry-pick-refresh-index' into maintLibravatar Junio C Hamano2-2/+26
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
2010-12-09Merge branch 'jl/add-p-reverse-message' into maintLibravatar Junio C Hamano1-2/+11
* jl/add-p-reverse-message: Correct help blurb in checkout -p and friends
2010-12-09Merge branch 'np/diff-in-corrupt-repository' into maintLibravatar Junio C Hamano1-2/+6
* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing
2010-12-09Merge branch 'fc/apply-p2-get-header-name' into maintLibravatar Junio C Hamano2-14/+40
* fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1
2010-12-09Merge branch 'np/pack-broken-boundary' into maintLibravatar Junio C Hamano1-1/+15
* np/pack-broken-boundary: make pack-objects a bit more resilient to repo corruption
2010-12-09Merge branch 'ak/apply-non-git-epoch' into maintLibravatar Junio C Hamano5-6/+57
* ak/apply-non-git-epoch: apply: handle patches with funny filename and colon in timezone apply: Recognize epoch timestamps with : in the timezone
2010-12-09Merge branch 'cm/diff-check-at-eol' into maintLibravatar Junio C Hamano2-1/+10
* cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF
2010-12-09Merge branch 'tc/smart-http-post-redirect' into maintLibravatar Junio C Hamano3-0/+20
* tc/smart-http-post-redirect: smart-http: Don't change POST to GET when following redirect
2010-12-09Merge branch 'ab/require-perl-5.8' into maintLibravatar Junio C Hamano16-13/+27
* ab/require-perl-5.8: perl: use "use warnings" instead of -w perl: bump the required Perl version to 5.8 from 5.6.[21]
2010-12-09contrib/hooks/post-receive-email: fix return values from prep_for_emailLibravatar Alan Raison1-4/+4
The function was returning 0 for failure and 1 for success which was breaking the logic in the main loop. It now also returns in all cases, rather than exiting. Signed-off-by: Alan Raison <alan@theraisons.me.uk> Acked-by: Kevin P. Fleming <kpfleming@digium.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-08Merge branch 'nd/maint-fix-add-typo-detection' (early part)Libravatar Junio C Hamano1-1/+2
* 'nd/maint-fix-add-typo-detection' (early part): add: do not rely on dtype being NULL behavior
2010-12-08Merge branch 'jn/gitweb-time-hires-comes-with-5.8'Libravatar Junio C Hamano1-7/+5
* jn/gitweb-time-hires-comes-with-5.8: gitweb: Time::HiRes is in core for Perl 5.8
2010-12-08Merge branch 'il/remote-fd-ext'Libravatar Junio C Hamano11-0/+837
* il/remote-fd-ext: remote-fd/ext: finishing touches after code review git-remote-ext git-remote-fd Add bidirectional_transfer_loop() Conflicts: compat/mingw.h
2010-12-08Merge branch 'jk/pager-per-command'Libravatar Junio C Hamano3-10/+52
* jk/pager-per-command: allow command-specific pagers in pager.<cmd>
2010-12-08Merge branch 'jk/maint-decorate-01-bool'Libravatar Junio C Hamano2-2/+23
* jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
2010-12-08Merge branch 'gc/http-with-non-ascii-username-url'Libravatar Junio C Hamano5-1/+51
* gc/http-with-non-ascii-username-url: Fix username and password extraction from HTTP URLs t5550: test HTTP authentication and userinfo decoding Conflicts: t/lib-httpd/apache.conf
2010-12-08Merge branch 'ks/maint-getenv-fix'Libravatar Junio C Hamano1-0/+1
* ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case
2010-12-08Merge branch 'gb/gitweb-remote-heads'Libravatar Junio C Hamano3-8/+268
* gb/gitweb-remote-heads: git instaweb: enable remote_heads gitweb: group remote heads by remote gitweb: provide a routine to display (sub)sections gitweb: refactor repository URL printing gitweb: remotes view for a single remote gitweb: allow action specialization in page header gitweb: nagivation menu for tags, heads and remotes gitweb: separate heads and remotes lists gitweb: git_get_heads_list accepts an optional list of refs gitweb: introduce remote_heads feature gitweb: use fullname as hash_base in heads link
2010-12-08Merge branch 'mg/maint-tag-rfc1991'Libravatar Junio C Hamano5-20/+88
* mg/maint-tag-rfc1991: tag: recognize rfc1991 signatures tag: factor out sig detection for tag display tag: factor out sig detection for body edits verify-tag: factor out signature detection t/t7004-tag: test handling of rfc1991 signatures
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 03:43:12 +0000