Junio C Hamano [Wed, 15 Dec 2010 23:30:49 +0000 (15:30 -0800)]
Sync with 1.7.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:47:40 +0000 (11:47 -0800)]
Git 1.7.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:45:36 +0000 (11:45 -0800)]
Git 1.7.2.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:40:40 +0000 (11:40 -0800)]
Git 1.7.1.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:38:19 +0000 (11:38 -0800)]
Git 1.7.0.9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:32:57 +0000 (11:32 -0800)]
Git 1.6.6.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:27:41 +0000 (11:27 -0800)]
Git 1.6.5.9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 15 Dec 2010 19:19:11 +0000 (11:19 -0800)]
Git 1.6.4.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narebski [Tue, 14 Dec 2010 23:34:01 +0000 (00:34 +0100)]
gitweb: Introduce esc_attr to escape attributes of HTML elements
It is needed only to escape attributes of handcrafted HTML elements,
and not those generated using CGI.pm subroutines / methods for HTML
generation.
While at it, add esc_url and esc_html where needed, and prefer to use
CGI.pm HTML generating methods than handcrafted HTML code. Most of
those are probably unnecessary (could be exploited only by person with
write access to gitweb config, or at least access to the repository).
This fixes CVE-2010-3906
Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it>
Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 14 Dec 2010 17:09:13 +0000 (09:09 -0800)]
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Add Brazilian Portuguese (pt-BR) translation
gitk: Make text selectable on Mac
gitk: Prevent the text pane from becoming editable
gitk: Add the equivalent of diff --color-words
gitk: Update Swedish translation (290t)
gitk: Show notes by default (like git log does)
Junio C Hamano [Tue, 14 Dec 2010 16:57:38 +0000 (08:57 -0800)]
Merge branch 'maint'
* maint:
Prepare for 1.7.3.4
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Do not link with -lcrypto under NO_OPENSSL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 14 Dec 2010 15:51:35 +0000 (07:51 -0800)]
Prepare for 1.7.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher [Mon, 15 Nov 2010 19:52:19 +0000 (20:52 +0100)]
use persistent memory for rejected paths
An aborted merge prints the list of rejected paths as part of the
error message. Since commit
f66caaf9 (do not overwrite files in
leading path), some of those paths do not have static buffers, so
we have to keep a copy. Use string_list's to accomplish this.
This changes the order of the list to the order in which the paths
are processed. Previously, it was reversed.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher [Sat, 9 Oct 2010 13:53:00 +0000 (15:53 +0200)]
do not overwrite files in leading path
If the work tree contains an untracked file x, and
unpack-trees wants to checkout a path x/*, the
file x is removed unconditionally.
Instead, apply the same checks that are normally
used for untracked files, and abort if the file
cannot be removed.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher [Sat, 9 Oct 2010 13:52:59 +0000 (15:52 +0200)]
lstat_cache: optionally return match_len
Return match_len so that the caller can know which leading path
component matched.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher [Sat, 9 Oct 2010 13:52:58 +0000 (15:52 +0200)]
add function check_ok_to_remove()
This wraps some inline code into the function check_ok_to_remove(),
which will later be used for leading path components as well.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher [Sun, 10 Oct 2010 08:38:58 +0000 (10:38 +0200)]
t7607: add leading-path tests
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher [Sun, 10 Oct 2010 08:35:43 +0000 (10:35 +0200)]
t7607: use test-lib functions and check MERGE_HEAD
Use the test_commit and test_path_is_missing
functions from the test library.
Also make sure that a merge which fails due to
pre-merge checks aborts properly and does not
leave MERGE_HEAD behind.
The "will not overwrite removed file" test is an
exception to this. It notices the untracked file
at a stage where the merge is already well under
way. Therefore we cannot abort the merge without
major restructuring. See the following thread for
more details.
http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.org
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 14 Dec 2010 15:50:20 +0000 (07:50 -0800)]
Merge branch 'jc/maint-no-openssl-build-fix' into maint
* jc/maint-no-openssl-build-fix:
Do not link with -lcrypto under NO_OPENSSL
Junio C Hamano [Tue, 14 Dec 2010 15:36:23 +0000 (07:36 -0800)]
Merge branch 'ja/maint-pull-rebase-doc' into maint
* ja/maint-pull-rebase-doc:
git-pull.txt: Mention branch.autosetuprebase
Junio C Hamano [Tue, 14 Dec 2010 15:36:10 +0000 (07:36 -0800)]
Merge branch 'tc/http-urls-ends-with-slash' into maint
* 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 '&&'
Junio C Hamano [Tue, 14 Dec 2010 15:36:00 +0000 (07:36 -0800)]
Merge branch 'nd/maint-hide-checkout-index-from-error' into maint
* nd/maint-hide-checkout-index-from-error:
entry.c: remove "checkout-index" from error messages
Junio C Hamano [Tue, 14 Dec 2010 15:35:50 +0000 (07:35 -0800)]
Merge branch 'jk/maint-reflog-bottom' into maint
* jk/maint-reflog-bottom:
reflogs: clear flags properly in corner case
Junio C Hamano [Tue, 14 Dec 2010 15:35:44 +0000 (07:35 -0800)]
Merge branch 'mz/rebase-abort-reflog-fix' into maint
* mz/rebase-abort-reflog-fix:
rebase --abort: do not update branch ref
Junio C Hamano [Tue, 14 Dec 2010 15:35:31 +0000 (07:35 -0800)]
Merge branch 'mz/maint-rebase-stat-config' into maint
* mz/maint-rebase-stat-config:
rebase: only show stat if configured to true
Junio C Hamano [Tue, 14 Dec 2010 15:35:18 +0000 (07:35 -0800)]
Merge branch 'gc/http-with-non-ascii-username-url' into maint
* 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
Alexandre Erwin Ittner [Tue, 7 Dec 2010 22:56:06 +0000 (20:56 -0200)]
gitk: Add Brazilian Portuguese (pt-BR) translation
Translating a SCM is tricky due to amount of jargon, so, I tried to
keep the wording consistent with both the German and Italian git
translations and the pt-BR translation of other SCMs.
Signed-off-by: Alexandre Erwin Ittner <alexandre@ittner.com.br>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Michael J Gruber [Mon, 13 Dec 2010 16:12:29 +0000 (17:12 +0100)]
t800?-blame.sh: retitle uniquely
Currently we have three test files matching t800?-blame.sh.
Rename the latter two to make it easier to spot where additions would
go.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Mon, 13 Dec 2010 17:07:34 +0000 (12:07 -0500)]
tests: flip executable bit on t9158
All tests are supposed to be executable.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Mon, 13 Dec 2010 17:22:38 +0000 (12:22 -0500)]
tests: add some script lint checks
There are some common but minor errors we tend to make in
writing test scripts:
1. Scripts are left non-executable. This is not usually
noticed immediately because "make test" does not need
the bit, but it is a matter of git policy to make them
executable (and is a slight convenience when running
individual scripts).
2. Two scripts are allocated the same number. Usually this
happens on separate branches, and the problem only
comes about during a merge. But since there is no
textual conflict, the merger would have to be very
observant to notice.
This is also a minor error, but can make GIT_SKIP_TESTS
ambiguous.
This patch introduces a "test-lint" target which checks
both. It is not invoked by default. You can invoke it as
"make test-lint", or you can make it a prerequisite of
running the tests by specifying "TEST_LINT = test-lint" in
your config.mak or on the command line.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt [Mon, 13 Dec 2010 10:14:02 +0000 (11:14 +0100)]
Avoid duplicate test number t7609
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)]
Merge branch 'ja/maint-pull-rebase-doc'
* ja/maint-pull-rebase-doc:
git-pull.txt: Mention branch.autosetuprebase
Junio C Hamano [Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)]
Merge branch 'gb/web--browse'
* gb/web--browse:
web--browse: better support for chromium
web--browse: support opera, seamonkey and elinks
web--browse: split valid_tool list
web--browse: coding style
Junio C Hamano [Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)]
Merge branch 'jn/parse-options-extra'
* 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
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'js/configurable-tab'
* js/configurable-tab:
Make the tab width used for whitespace checks configurable
apply --whitespace=fix: fix tab-in-indent
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'nd/maint-hide-checkout-index-from-error'
* nd/maint-hide-checkout-index-from-error:
entry.c: remove "checkout-index" from error messages
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'jn/gitweb-per-request-config'
* jn/gitweb-per-request-config:
gitweb: document $per_request_config better
gitweb: selectable configurations that change with each request
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'ef/help-cmd-prefix'
* ef/help-cmd-prefix:
help: always suggest common-cmds if prefix of cmd
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'tc/http-urls-ends-with-slash'
* 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 '&&'
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'tc/format-patch-p'
* tc/format-patch-p:
format-patch: page output with --stdout
Junio C Hamano [Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)]
Merge branch 'ef/win32-dirent'
* 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
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify:
rebase: support --verify
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'mz/rebase-abort-reflog-fix'
* mz/rebase-abort-reflog-fix:
rebase --abort: do not update branch ref
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'jk/maint-reflog-bottom'
* jk/maint-reflog-bottom:
reflogs: clear flags properly in corner case
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'jk/asciidoc-update'
* jk/asciidoc-update:
docs: default to more modern toolset
Junio C Hamano [Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)]
Merge branch 'mz/pull-rebase-rebased'
* mz/pull-rebase-rebased:
Use reflog in 'pull --rebase . foo'
Junio C Hamano [Mon, 13 Dec 2010 05:49:50 +0000 (21:49 -0800)]
Merge branch 'mz/maint-rebase-stat-config'
* mz/maint-rebase-stat-config:
rebase: only show stat if configured to true
Junio C Hamano [Mon, 13 Dec 2010 05:49:50 +0000 (21:49 -0800)]
Merge branch 'jn/git-cmd-h-bypass-setup'
* 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
Stefan Haller [Sun, 14 Nov 2010 12:22:56 +0000 (13:22 +0100)]
gitk: Make text selectable on Mac
Stolen from git-gui,
23effa79f7 (original log message by
Shawn O. Pearce <spearce@spearce.org> follows):
git-gui: Force focus to the diff viewer on mouse click.
Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text
widget cannot receive focus or receive a selection within it. This
makes the diff viewer almost useless on that platform as you cannot
select individual parts of the buffer.
Now we force focus into the diff viewer when its clicked on with
button 1. This works around the feature and allows selection to
work within the viewer just like it does on other less sane systems,
like Microsoft Windows.
Signed-off-by: Stefan Haller <stefan@haller-berlin.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Stefan Haller [Sun, 14 Nov 2010 12:21:50 +0000 (13:21 +0100)]
gitk: Prevent the text pane from becoming editable
When setting the "Patch/Tree" radio buttons to "Tree" and
clicking on a file to display it, the text pane would
accidentally become editable (because of the early return
in getblobline).
Signed-off-by: Stefan Haller <stefan@haller-berlin.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Thomas Rast [Sat, 16 Oct 2010 10:15:10 +0000 (12:15 +0200)]
gitk: Add the equivalent of diff --color-words
Use the newly added 'diff --word-diff=porcelain' to teach gitk a
color-words mode, with two different modes analogous to the
--word-diff=plain and --word-diff=color settings. These are selected
by a dropdown box.
As an extra twist, automatically enable this word-diff support when
the user mentions a word-diff related option on the command line.
These options were previously ignored because they would break diff
parsing.
Both of these features are only enabled if we have a version of git
that supports --word-diff=porcelain, meaning at least 1.7.2.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Peter Krefting [Sun, 12 Sep 2010 20:17:05 +0000 (21:17 +0100)]
gitk: Update Swedish translation (290t)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Sat, 11 Dec 2010 00:40:00 +0000 (16:40 -0800)]
Relnotes: remove items fixed on 'maint'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 11 Dec 2010 00:36:19 +0000 (16:36 -0800)]
Merge branch 'maint'
Junio C Hamano [Sat, 11 Dec 2010 00:35:00 +0000 (16:35 -0800)]
Prepare for 1.7.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 11 Dec 2010 00:13:14 +0000 (16:13 -0800)]
Merge branch 'jk/maint-decorate-01-bool' into maint
* jk/maint-decorate-01-bool:
log.decorate: accept 0/1 bool values
Junio C Hamano [Sat, 11 Dec 2010 00:13:03 +0000 (16:13 -0800)]
Merge branch 'mg/maint-tag-rfc1991' into maint
* 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
Junio C Hamano [Sat, 11 Dec 2010 00:12:51 +0000 (16:12 -0800)]
Merge branch 'ks/maint-getenv-fix' into maint
* ks/maint-getenv-fix:
setup: make sure git_dir path is in a permanent buffer, getenv(3) case
Junio C Hamano [Fri, 10 Dec 2010 18:32:12 +0000 (10:32 -0800)]
thread-utils.h: simplify the inclusion
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>
Jonathan Nieder [Fri, 10 Dec 2010 19:48:25 +0000 (13:48 -0600)]
Makefile: transport-helper uses thread-utils.h
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>
Alejandro R. Sedeño [Fri, 10 Dec 2010 18:44:15 +0000 (13:44 -0500)]
Add --force to git-send-email documentation
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 10 Dec 2010 00:03:41 +0000 (16:03 -0800)]
Merge git://git.bogomips.org/git-svn
* 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
Junio C Hamano [Thu, 9 Dec 2010 23:52:12 +0000 (15:52 -0800)]
Documentation/git.txt: update list of maintenance releases
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>
Torsten Bögershausen [Thu, 9 Dec 2010 19:53:19 +0000 (20:53 +0100)]
t9143: do not fail when unhandled.log.gz is not created
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>
Steven Walter [Sat, 25 Sep 2010 03:51:50 +0000 (23:51 -0400)]
git-svn: allow the mergeinfo property to be set
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>
Junio C Hamano [Thu, 9 Dec 2010 18:45:53 +0000 (10:45 -0800)]
Merge branch 'maint'
* maint:
contrib/hooks/post-receive-email: fix return values from prep_for_email
Junio C Hamano [Thu, 9 Dec 2010 18:38:16 +0000 (10:38 -0800)]
Merge branch 'jn/ignore-doc' into maint
* jn/ignore-doc:
Documentation: point to related commands from gitignore
Documentation: split gitignore page into sections
Junio C Hamano [Thu, 9 Dec 2010 18:36:51 +0000 (10:36 -0800)]
Merge branch 'jn/cherry-pick-refresh-index' into maint
* jn/cherry-pick-refresh-index:
cherry-pick/revert: transparently refresh index
Junio C Hamano [Thu, 9 Dec 2010 18:36:47 +0000 (10:36 -0800)]
Merge branch 'jl/add-p-reverse-message' into maint
* jl/add-p-reverse-message:
Correct help blurb in checkout -p and friends
Junio C Hamano [Thu, 9 Dec 2010 18:36:39 +0000 (10:36 -0800)]
Merge branch 'np/diff-in-corrupt-repository' into maint
* np/diff-in-corrupt-repository:
diff: don't presume empty file when corresponding object is missing
Junio C Hamano [Thu, 9 Dec 2010 18:36:36 +0000 (10:36 -0800)]
Merge branch 'fc/apply-p2-get-header-name' into maint
* fc/apply-p2-get-header-name:
test: git-apply -p2 rename/chmod only
Fix git-apply with -p greater than 1
Junio C Hamano [Thu, 9 Dec 2010 18:36:23 +0000 (10:36 -0800)]
Merge branch 'np/pack-broken-boundary' into maint
* np/pack-broken-boundary:
make pack-objects a bit more resilient to repo corruption
Junio C Hamano [Thu, 9 Dec 2010 18:36:16 +0000 (10:36 -0800)]
Merge branch 'ak/apply-non-git-epoch' into maint
* ak/apply-non-git-epoch:
apply: handle patches with funny filename and colon in timezone
apply: Recognize epoch timestamps with : in the timezone
Junio C Hamano [Thu, 9 Dec 2010 18:36:10 +0000 (10:36 -0800)]
Merge branch 'cm/diff-check-at-eol' into maint
* cm/diff-check-at-eol:
diff --check: correct line numbers of new blank lines at EOF
Junio C Hamano [Thu, 9 Dec 2010 18:36:04 +0000 (10:36 -0800)]
Merge branch 'tc/smart-http-post-redirect' into maint
* tc/smart-http-post-redirect:
smart-http: Don't change POST to GET when following redirect
Junio C Hamano [Thu, 9 Dec 2010 18:35:21 +0000 (10:35 -0800)]
Merge branch 'ab/require-perl-5.8' into maint
* 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]
Alan Raison [Thu, 9 Dec 2010 16:03:05 +0000 (16:03 +0000)]
contrib/hooks/post-receive-email: fix return values from prep_for_email
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>
Junio C Hamano [Wed, 8 Dec 2010 22:54:13 +0000 (14:54 -0800)]
Do not link with -lcrypto under NO_OPENSSL
With
401857c (imap-send: link against libcrypto for HMAC and others,
2010-11-24) we started linking imap-send unconditionally with -lcrypto by
mistake; disable this when we are building under NO_OPENSSL.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 8 Dec 2010 19:25:52 +0000 (11:25 -0800)]
Merge branch 'nd/maint-fix-add-typo-detection' (early part)
* 'nd/maint-fix-add-typo-detection' (early part):
add: do not rely on dtype being NULL behavior
Junio C Hamano [Wed, 8 Dec 2010 19:25:04 +0000 (11:25 -0800)]
Merge branch 'jn/gitweb-time-hires-comes-with-5.8'
* jn/gitweb-time-hires-comes-with-5.8:
gitweb: Time::HiRes is in core for Perl 5.8
Junio C Hamano [Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)]
Merge branch 'il/remote-fd-ext'
* 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
Junio C Hamano [Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)]
Merge branch 'jk/pager-per-command'
* jk/pager-per-command:
allow command-specific pagers in pager.<cmd>
Junio C Hamano [Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)]
Merge branch 'jk/maint-decorate-01-bool'
* jk/maint-decorate-01-bool:
log.decorate: accept 0/1 bool values
Junio C Hamano [Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)]
Merge branch 'gc/http-with-non-ascii-username-url'
* 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
Junio C Hamano [Wed, 8 Dec 2010 19:24:13 +0000 (11:24 -0800)]
Merge branch 'ks/maint-getenv-fix'
* ks/maint-getenv-fix:
setup: make sure git_dir path is in a permanent buffer, getenv(3) case
Junio C Hamano [Wed, 8 Dec 2010 19:24:13 +0000 (11:24 -0800)]
Merge branch 'gb/gitweb-remote-heads'
* 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
Junio C Hamano [Wed, 8 Dec 2010 19:24:13 +0000 (11:24 -0800)]
Merge branch 'mg/maint-tag-rfc1991'
* 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
Junio C Hamano [Wed, 8 Dec 2010 19:24:12 +0000 (11:24 -0800)]
Merge branch 'jh/notes-merge'
* jh/notes-merge: (23 commits)
Provide 'git merge --abort' as a synonym to 'git reset --merge'
cmd_merge(): Parse options before checking MERGE_HEAD
Provide 'git notes get-ref' to easily retrieve current notes ref
git notes merge: Add testcases for merging notes trees at different fanouts
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
git notes merge: --commit should fail if underlying notes ref has moved
git notes merge: List conflicting notes in notes merge commit message
git notes merge: Manual conflict resolution, part 2/2
git notes merge: Manual conflict resolution, part 1/2
Documentation: Preliminary docs on 'git notes merge'
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
git notes merge: Handle real, non-conflicting notes merges
builtin/notes.c: Refactor creation of notes commits.
git notes merge: Initial implementation handling trivial merges only
builtin/notes.c: Split notes ref DWIMmery into a separate function
notes.c: Use two newlines (instead of one) when concatenating notes
(trivial) t3303: Indent with tabs instead of spaces for consistency
notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
notes.h/c: Allow combine_notes functions to remove notes
notes.c: Reorder functions in preparation for next commit
...
Conflicts:
builtin.h
Junio C Hamano [Wed, 8 Dec 2010 19:24:11 +0000 (11:24 -0800)]
Merge branch 'jk/diff-CBM'
* jk/diff-CBM:
diff: report bogus input to -C/-M/-B
Junio C Hamano [Wed, 8 Dec 2010 00:13:43 +0000 (16:13 -0800)]
Merge branch 'maint'
* maint:
git-rm.txt: Fix quoting
Jonathan Nieder [Wed, 1 Dec 2010 23:34:06 +0000 (17:34 -0600)]
update-index: migrate to parse-options API
--refresh and --really-refresh accept flags (like -q) and modify
an error indicator. It might make sense to make the error
indicator global, but just pass the flags and a pointer to the error
indicator in a struct instead.
--cacheinfo wants 3 arguments. Use the OPTION_LOWLEVEL_CALLBACK
extension to grab them and PARSE_OPT_NOARG to disallow the "sticked"
--cacheinfo=foo form. (The resulting message
$ git update-index --cacheinfo=foo
error: option `cacheinfo' takes no value
is unfortunately incorrect.)
--assume-unchanged and --no-assume-unchanged probably should use the
OPT_UYN feature; but use a callback for now so the existing MARK_FLAG
and UNMARK_FLAG values can be used.
--stdin and --index-info are still constrained to be the last argument
(implemented using the OPTION_LOWLEVEL_CALLBACK extension).
--unresolve and --again consume all arguments that come after them
(also using OPTION_LOWLEVEL_CALLBACK).
The order of options matters. Each path on the command line is
affected only by the options that come before it. A custom
argument-parsing loop with parse_options_step() brings that about.
In exchange for all the fuss, we get the usual perks: support for
un-sticked options, better usage error messages, more useful -h
output, and argument parsing code that should be easier to tweak
in the future.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy [Wed, 1 Dec 2010 23:33:22 +0000 (17:33 -0600)]
setup: save prefix (original cwd relative to toplevel) in startup_info
Save the path from the original cwd to the cwd at the end of the
setup procedure in the startup_info struct introduced in
e37c1329
(2010-08-05). The value cannot vary from thread to thread anyway,
since the cwd is global.
So now in your builtin command, instead of passing prefix around,
when you want to convert a user-supplied path to a cwd-relative
path, you can use startup_info->prefix directly.
Caveat: As with the return value from setup_git_directory_gently(),
startup_info->prefix would be NULL when the original cwd is not a
subdir of the toplevel.
Longer term, this would allow the prefix to be reused when several
noncooperating functions require access to the same repository (for
example, when accessing configuration before running a builtin).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Wed, 1 Dec 2010 23:32:55 +0000 (17:32 -0600)]
parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
Introduce a PARSE_OPT_NON_OPTION state, so parse_option_step()
callers can easily distinguish between non-options and other
reasons for option parsing termination (like "--").
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Wed, 1 Dec 2010 23:32:16 +0000 (17:32 -0600)]
parse-options: allow git commands to invent new option types
parse-options provides a variety of option behaviors, including
OPTION_CALLBACK, which should take care of just about any sane
behavior. All supported behaviors obey the following constraint:
A --foo option can only accept (and base its behavior on)
one argument, which would be the following command-line
argument in the "unsticked" form.
Alas, some existing git commands have options that do not obey that
constraint. For example, update-index --cacheinfo takes three
arguments, and update-index --resolve takes all later parameters as
arguments.
Introduces an OPTION_LOWLEVEL_CALLBACK backdoor to parse-options so
such option types can be supported without tempting inventors of other
commands through mention in the public API. Commands can set the
callback field to a function accepting three arguments: the option
parsing context, the option itself, and a flag indicating whether the
the option was negated. When the option is encountered, that function
is called to take over from get_value(). The return value should be
zero for success, -1 for usage errors.
Thanks to Stephen Boyd for API guidance.
Improved-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Wed, 1 Dec 2010 23:31:36 +0000 (17:31 -0600)]
parse-options: never suppress arghelp if LITERAL_ARGHELP is set
The PARSE_OPT_LITERAL_ARGHELP flag allows a program to override the
standard "<argument> for mandatory, [argument] for optional" markup in
its help message. Extend it to override the usual "no text for
disallowed", too (for the PARSE_OPT_NOARG | PARSE_OPT_LITERAL_ARGHELP
case, which was previously meaningless), to be more intuitive.
The motivation is to allow update-index to correctly advertise
--cacheinfo <mode> <object> <path>
add the specified entry to the index
while abusing PARSE_OPT_NOARG to disallow the "sticked form"
--cacheinfo=<mode> <object> <path>
Noticed-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd [Wed, 1 Dec 2010 23:30:40 +0000 (17:30 -0600)]
parse-options: do not infer PARSE_OPT_NOARG from option type
Simplify the "takes no value" error path by relying on PARSE_OPT_NOARG
being set correctly. That is:
- if the PARSE_OPT_NOARG flag is set, reject --opt=value
regardless of the option type;
- if the PARSE_OPT_NOARG flag is unset, accept --opt=value
regardless of the option type.
This way, the accepted usage more closely matches the usage advertised
with --help-all.
No functional change intended, since the NOARG flag is only used
with "boolean-only" option types in existing parse_options callers.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Thu, 2 Dec 2010 06:08:57 +0000 (00:08 -0600)]
parse-options: sanity check PARSE_OPT_NOARG flag
Some option types cannot use an argument --- boolean options that
would set a bit or flag or increment a counter, for example. If
configured in the flag word to accept an argument anyway, the result
is an argument that is advertised in "program -h" output only to be
rejected by parse-options::get_value.
Luckily all current users of these option types use PARSE_OPT_NOARG
and do not use PARSE_OPT_OPTARG. Add a check to ensure that that
remains true. The check is run once for each invocation of
parse_option_start().
Improved-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Thu, 2 Dec 2010 06:05:05 +0000 (00:05 -0600)]
parse-options: move NODASH sanity checks to parse_options_check
A dashless switch (like '(' passed to 'git grep') cannot be negated,
cannot be attached to an argument, and cannot have a long form.
Currently parse-options runs the related sanity checks when the
dashless option is used; better to always check them at the start of
option parsing, so mistakes can be caught more quickly.
The error message at the new call site is less specific about the
nature of the error, for simplicity. On the other hand, it prints
which switch was problematic. Before:
fatal: BUG: dashless options can't be long
After:
error: BUG: switch '(' uses feature not supported for dashless options
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder [Thu, 2 Dec 2010 06:01:18 +0000 (00:01 -0600)]
parse-options: clearer reporting of API misuse
The PARSE_OPT_LASTARG_DEFAULT flag is meant for options like
--contains that (1) traditionally had a mandatory argument and
(2) have some better behavior to use when appearing in the final
position. It makes no sense to combine this with OPTARG, so ever
since v1.6.4-rc0~71 (parse-options: add parse_options_check to
validate option specs, 2009-07-09) this mistake is flagged with
error: `--option` uses incompatible flags LASTARG_DEFAULT and OPTARG
and an exit status representing an error in commandline usage.
Unfortunately that which might confuse scripters calling such an
erroneous program into thinking the _script_ contains an error.
Clarify that it is an internal error by dying with a message beginning
"error: BUG: ..." and status 128.
While at it, clean up parse_options_check to prepare for more checks.
Long term, it would be nicer to make such checks happen at compile
time.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber [Tue, 7 Dec 2010 09:07:11 +0000 (10:07 +0100)]
git-rm.txt: Fix quoting
Literal " produces typographically incorrect quotations, but "works" in
most circumstances. In the subheadings of git-rm.txt, it "works" for the
html backend but not for the docbook conversion to nroff: double "" and
spurious double spaces appear in the output.
Replace "incorrect" quotations by ``correct'' ones, and fix other
"quotations" which are really `code fragments`.
This should make git-rm.txt "-clean.
Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>