gitweb.git
gitweb: Move static files into seperate subdirectoryPavan Kumar Sunkara Fri, 28 May 2010 06:25:49 +0000 (11:55 +0530)

gitweb: Move static files into seperate subdirectory

Create a new subdirectory called 'static' in gitweb/, and move
all static files required by gitweb.cgi when running, which means
styles, images and Javascript code. This should make gitweb more
readable and easier to maintain.

Update t/gitweb-lib.sh to reflect this change.The install-gitweb
now also include moving of static files into 'static' subdirectory
in target directory: update Makefile, gitweb's INSTALL, README and
Makefile accordingly.

Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Petr Baudis <pasky@ucw.cz>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 25 May 2010 20:13:43 +0000 (13:13 -0700)

Merge branch 'maint'

* maint:
Documentation/SubmittingPatches: clarify GMail section and SMTP
show-branch: use DEFAULT_ABBREV instead of 7
t7502-commit: fix spelling
test get_git_work_tree() return value for NULL

Documentation/SubmittingPatches: clarify GMail section... Michael J Gruber Tue, 25 May 2010 08:30:13 +0000 (10:30 +0200)

Documentation/SubmittingPatches: clarify GMail section and SMTP

We keep getting mangled submissions from GMail's web interface. Try to
be more proactive in SubmittingPatches by

- pointing to MUA specific instructions early on,
- structuring the GMail section more clearly,
- putting send-email/SMTP before imap-send/IMAP.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

show-branch: use DEFAULT_ABBREV instead of 7Tay Ray Chuan Mon, 24 May 2010 08:50:44 +0000 (16:50 +0800)

show-branch: use DEFAULT_ABBREV instead of 7

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7502-commit: fix spellingTay Ray Chuan Mon, 24 May 2010 08:51:17 +0000 (16:51 +0800)

t7502-commit: fix spelling

s/subdirecotry/subdirectory/

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test get_git_work_tree() return value for NULLClemens Buchacher Sat, 22 May 2010 12:21:27 +0000 (14:21 +0200)

test get_git_work_tree() return value for NULL

If we are in a git directory, get_git_work_tree() can return NULL.
While trying to determine whether or not the given paths are outside
the work tree, the following command would read from it anyways and
trigger a segmentation fault.

git diff / /

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'by/blame-doc-m-c'Junio C Hamano Fri, 21 May 2010 11:02:24 +0000 (04:02 -0700)

Merge branch 'by/blame-doc-m-c'

* by/blame-doc-m-c:
blame-options.txt: Add default value for `-M/-C` options.

Merge branch 'by/log-follow'Junio C Hamano Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)

Merge branch 'by/log-follow'

* by/log-follow:
tests: rename duplicate t4205
Make git log --follow find copies among unmodified files.
Make diffcore_std only can run once before a diff_flush
Add a macro DIFF_QUEUE_CLEAR.

Merge branch 'mg/advice-statushints'Junio C Hamano Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)

Merge branch 'mg/advice-statushints'

* mg/advice-statushints:
wt-status: take advice.statusHints seriously
t7508: test advice.statusHints

Conflicts:
wt-status.c

Merge branch 'cb/maint-stash-orphaned-file'Junio C Hamano Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)

Merge branch 'cb/maint-stash-orphaned-file'

* cb/maint-stash-orphaned-file:
stash tests: stash can lose data in a file removed from the index
stash: Don't overwrite files that have gone from the index

Merge branch 'jn/maint-bundle'Junio C Hamano Fri, 21 May 2010 11:02:22 +0000 (04:02 -0700)

Merge branch 'jn/maint-bundle'

* jn/maint-bundle:
fix "bundle --stdin" segfault
t5704 (bundle): add tests for bundle --stdin

Merge branch 'pb/patch-id-plus'Junio C Hamano Fri, 21 May 2010 11:02:22 +0000 (04:02 -0700)

Merge branch 'pb/patch-id-plus'

* pb/patch-id-plus:
patch-id: Add support for mbox format
patch-id: extract parsing one diff out of generate_id_list

Merge branch 'rr/doc-submitting'Junio C Hamano Fri, 21 May 2010 11:02:22 +0000 (04:02 -0700)

Merge branch 'rr/doc-submitting'

* rr/doc-submitting:
SubmittingPatches: Add new section about what to base work on

Merge branch 'st/remote-tags-no-tags'Junio C Hamano Fri, 21 May 2010 11:02:22 +0000 (04:02 -0700)

Merge branch 'st/remote-tags-no-tags'

* st/remote-tags-no-tags:
remote add: add a --[no-]tags option
Honor "tagopt = --tags" configuration option

Merge branch 'jn/fsck-ident'Junio C Hamano Fri, 21 May 2010 11:02:21 +0000 (04:02 -0700)

Merge branch 'jn/fsck-ident'

* jn/fsck-ident:
fsck: check ident lines in commit objects

Merge branch 'jn/gitweb-caching-prep'Junio C Hamano Fri, 21 May 2010 11:02:21 +0000 (04:02 -0700)

Merge branch 'jn/gitweb-caching-prep'

* jn/gitweb-caching-prep:
gitweb: Move generating page title to separate subroutine
gitweb: Add custom error handler using die_error
gitweb: Use nonlocal jump instead of 'exit' in die_error
gitweb: href(..., -path_info => 0|1)
Export more test-related variables when running external tests

Merge branch 'jn/gitweb-install'Junio C Hamano Fri, 21 May 2010 11:02:21 +0000 (04:02 -0700)

Merge branch 'jn/gitweb-install'

* jn/gitweb-install:
gitweb: Create install target for gitweb in Makefile
gitweb: Improve installation instructions in gitweb/INSTALL

Merge branch 'jn/gitweb-our-squelch'Junio C Hamano Fri, 21 May 2010 11:02:20 +0000 (04:02 -0700)

Merge branch 'jn/gitweb-our-squelch'

* jn/gitweb-our-squelch:
gitweb: Silence 'Variable VAR may be unavailable' warnings

Merge branch 'jn/request-pull'Junio C Hamano Fri, 21 May 2010 11:02:20 +0000 (04:02 -0700)

Merge branch 'jn/request-pull'

* jn/request-pull:
tests: chmod +x t5150
adapt request-pull tests for new pull request format
t5150: protect backslash with backslash in shell
request-pull: protect against OPTIONS_KEEPDASHDASH from environment
tests for request-pull

Merge branch 'jn/shortlog'Junio C Hamano Fri, 21 May 2010 11:02:20 +0000 (04:02 -0700)

Merge branch 'jn/shortlog'

* jn/shortlog:
pretty: Respect --abbrev option
shortlog: Document and test --format option
t4201 (shortlog): Test output format with multiple authors
t4201 (shortlog): guard setup with test_expect_success
Documentation/shortlog: scripted users should not rely on implicit HEAD

Merge branch 'jn/t7006-fixup'Junio C Hamano Fri, 21 May 2010 11:02:20 +0000 (04:02 -0700)

Merge branch 'jn/t7006-fixup'

* jn/t7006-fixup:
t7006: guard cleanup with test_expect_success

Merge branch 'js/maint-receive-pack-symref-alias'Junio C Hamano Fri, 21 May 2010 11:02:19 +0000 (04:02 -0700)

Merge branch 'js/maint-receive-pack-symref-alias'

* js/maint-receive-pack-symref-alias:
t5516-fetch-push.sh: style cleanup
receive-pack: detect aliased updates which can occur with symrefs
receive-pack: switch global variable 'commands' to a parameter

Conflicts:
t/t5516-fetch-push.sh

Merge branch 'sp/maint-dumb-http-pack-reidx'Junio C Hamano Fri, 21 May 2010 11:02:19 +0000 (04:02 -0700)

Merge branch 'sp/maint-dumb-http-pack-reidx'

* sp/maint-dumb-http-pack-reidx:
http.c::new_http_pack_request: do away with the temp variable filename
http-fetch: Use temporary files for pack-*.idx until verified
http-fetch: Use index-pack rather than verify-pack to check packs
Allow parse_pack_index on temporary files
Extract verify_pack_index for reuse from verify_pack
Introduce close_pack_index to permit replacement
http.c: Remove unnecessary strdup of sha1_to_hex result
http.c: Don't store destination name in request structures
http.c: Drop useless != NULL test in finish_http_pack_request
http.c: Tiny refactoring of finish_http_pack_request
t5550-http-fetch: Use subshell for repository operations
http.c: Remove bad free of static block

Merge branch 'jn/submodule-basic-test'Junio C Hamano Fri, 21 May 2010 11:02:19 +0000 (04:02 -0700)

Merge branch 'jn/submodule-basic-test'

* jn/submodule-basic-test:
t7400: clarify submodule update tests
t7400: clarify 'submodule add' tests
t7400: split setup into multiple tests

Merge branch 'np/index-pack-memsave'Junio C Hamano Fri, 21 May 2010 11:02:19 +0000 (04:02 -0700)

Merge branch 'np/index-pack-memsave'

* np/index-pack-memsave:
index-pack: smarter memory usage when appending objects
index-pack: rationalize unpack_entry_data()
index-pack: smarter memory usage when resolving deltas

Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano Fri, 21 May 2010 11:02:18 +0000 (04:02 -0700)

Merge branch 'jc/am-3-show-corrupted-patch'

* jc/am-3-show-corrupted-patch:
am -3: recover the diagnostic messages for corrupt patches

Merge branch 'jc/maint-no-reflog-expire-unreach-for... Junio C Hamano Fri, 21 May 2010 11:02:18 +0000 (04:02 -0700)

Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'

* jc/maint-no-reflog-expire-unreach-for-head:
reflog --expire-unreachable: special case entries in "HEAD" reflog
more war on "sleep" in tests
Document gc.<pattern>.reflogexpire variables

Conflicts:
Documentation/config.txt

Merge branch 'cw/maint-exec-defpath'Junio C Hamano Fri, 21 May 2010 11:02:17 +0000 (04:02 -0700)

Merge branch 'cw/maint-exec-defpath'

* cw/maint-exec-defpath:
autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
exec_cmd.c: replace hard-coded path list with one from <paths.h>

Merge branch 'tr/word-diff'Junio C Hamano Fri, 21 May 2010 11:02:17 +0000 (04:02 -0700)

Merge branch 'tr/word-diff'

* tr/word-diff:
diff: add --word-diff option that generalizes --color-words

Conflicts:
diff.c

Merge branch 'sp/maint-describe-tiebreak-with-tagger... Junio C Hamano Fri, 21 May 2010 11:02:17 +0000 (04:02 -0700)

Merge branch 'sp/maint-describe-tiebreak-with-tagger-date'

* sp/maint-describe-tiebreak-with-tagger-date:
describe: Break annotated tag ties by tagger date
tag.c: Parse tagger date (if present)
tag.c: Refactor parse_tag_buffer to be saner to program
tag.h: Remove unused signature field
tag.c: Correct indentation

Merge branch 'jc/status-show-ignored'Junio C Hamano Fri, 21 May 2010 11:02:16 +0000 (04:02 -0700)

Merge branch 'jc/status-show-ignored'

* jc/status-show-ignored:
wt-status: fix 'fprintf' compilation warning
status: --ignored option shows ignored files
wt-status: rename and restructure status-print-untracked
wt-status: collect ignored files
wt-status: plug memory leak while collecting untracked files
wt-status: remove unused workdir_untracked member

Merge branch 'np/malloc-threading'Junio C Hamano Fri, 21 May 2010 11:02:16 +0000 (04:02 -0700)

Merge branch 'np/malloc-threading'

* np/malloc-threading:
Thread-safe xmalloc and xrealloc needs a recursive mutex
Make xmalloc and xrealloc thread-safe

Merge branch 'sr/remote-helper-export'Junio C Hamano Fri, 21 May 2010 11:02:15 +0000 (04:02 -0700)

Merge branch 'sr/remote-helper-export'

* sr/remote-helper-export:
t5800: testgit helper requires Python support
Makefile: Simplify handling of python scripts
remote-helpers: add tests for testgit helper
remote-helpers: add testgit helper
remote-helpers: add support for an export command
remote-helpers: allow requesing the path to the .git directory
fast-import: always create marks_file directories
clone: also configure url for bare clones
clone: pass the remote name to remote_get

Conflicts:
Makefile

Merge branch 'ld/discovery-limit-to-fs' (early part)Junio C Hamano Fri, 21 May 2010 11:02:15 +0000 (04:02 -0700)

Merge branch 'ld/discovery-limit-to-fs' (early part)

* 'ld/discovery-limit-to-fs' (early part):
Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
Add support for GIT_ONE_FILESYSTEM
truncate cwd string before printing error message
config.c: remove static keyword from git_env_bool()

Merge branch 'ar/config-from-command-line'Junio C Hamano Fri, 21 May 2010 11:02:14 +0000 (04:02 -0700)

Merge branch 'ar/config-from-command-line'

* ar/config-from-command-line:
Complete prototype of git_config_from_parameters()
Use strbufs instead of open-coded string manipulation
Allow passing of configuration parameters in the command line

Merge branch 'em/checkout-orphan'Junio C Hamano Fri, 21 May 2010 11:02:14 +0000 (04:02 -0700)

Merge branch 'em/checkout-orphan'

* em/checkout-orphan:
git checkout: create unparented branch by --orphan

Complete prototype of git_config_from_parameters()Thomas Rast Fri, 21 May 2010 10:07:47 +0000 (12:07 +0200)

Complete prototype of git_config_from_parameters()

Add the missing argument list. (Its lack triggered a compiler warning
for me.)

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Fri, 21 May 2010 10:13:07 +0000 (03:13 -0700)

Merge branch 'maint'

* maint:
Fix checkout of large files to network shares on Windows XP
start_command: close cmd->err descriptor when fork/spawn fails
Fix "Out of memory? mmap failed" for files larger than 4GB on Windows

Fix checkout of large files to network shares on Windows XPRené Scharfe Thu, 20 May 2010 18:57:53 +0000 (20:57 +0200)

Fix checkout of large files to network shares on Windows XP

Bigger writes to network drives on Windows XP fail. Cap them at 31MB to
allow them to succeed. Callers need to be prepared for write() calls
that do less work than requested anyway.

On local drives, write() calls are translated to WriteFile() calls with
a cap of 64KB on Windows XP and 256KB on Vista. Thus a cap of 31MB won't
affect the number of WriteFile() calls which do the actual work. There's
still room for some other version of Windows to use a chunk size of 1MB
without increasing the number of system calls.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

start_command: close cmd->err descriptor when fork... bert Dvornik Thu, 20 May 2010 18:57:52 +0000 (20:57 +0200)

start_command: close cmd->err descriptor when fork/spawn fails

Fix the problem where the cmd->err passed into start_command wasn't
being properly closed when certain types of errors occurr. (Compare
the affected code with the clean shutdown code later in the function.)

On Windows, this problem would be triggered if mingw_spawnvpe()
failed, which would happen if the command to be executed was malformed
(e.g. a text file that didn't start with a #! line). If cmd->err was
a pipe, the failure to close it could result in a hang while the other
side was waiting (forever) for either input or pipe close, e.g. while
trying to shove the output into the side band. On msysGit, this
problem was causing a hang in t5516-fetch-push.

[J6t: With a slight adjustment of the test case, the hang is also
observed on Linux.]

Signed-off-by: bert Dvornik <dvornik+git@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix "Out of memory? mmap failed" for files larger than... Ian McLean Thu, 20 May 2010 18:57:51 +0000 (20:57 +0200)

Fix "Out of memory? mmap failed" for files larger than 4GB on Windows

The git_mmap implementation was broken for file sizes that wouldn't fit
into a size_t (32 bits). This was caused by intermediate variables that
were only 32 bits wide when they should be 64 bits.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Thu, 20 May 2010 04:28:51 +0000 (21:28 -0700)

Merge branch 'maint'

* maint:
post-receive-email: document command-line mode

post-receive-email: document command-line modeJonathan Nieder Wed, 19 May 2010 19:01:47 +0000 (14:01 -0500)

post-receive-email: document command-line mode

According to the default hooks/post-receive file, the hook is called
with three arguments on stdin:

<oldrev> <newrev> <refname>

In command-line mode, the arguments come in a different order, because
the email hook instead calls:

generate_email $2 $3 $1

Add a comment to explain why, based on comments from the mailing list
and the commit message to v1.5.1~9. Thanks to Andy for the
explanation.

Requested-by: martin f. krafft <madduck@debian.org>
Cc: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 19 May 2010 05:39:56 +0000 (22:39 -0700)

Merge branch 'maint'

* maint:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
hash_object: correction for zero length file

Documentation/gitdiffcore: fix order in pickaxe descriptionMichael J Gruber Tue, 18 May 2010 10:49:33 +0000 (12:49 +0200)

Documentation/gitdiffcore: fix order in pickaxe description

Reverse the order of "origin" and "result" so that the sentence
really describes an addition rather than a removal.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: fix minor inconsistencyMichael J Gruber Thu, 13 May 2010 12:51:38 +0000 (14:51 +0200)

Documentation: fix minor inconsistency

While we don't always write out commands in full (`git command`) we
should do it consistently in adjacent paragraphs.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: rebase -i ignores options passed to... Markus Heidelberg Thu, 13 May 2010 12:47:53 +0000 (14:47 +0200)

Documentation: rebase -i ignores options passed to "git am"

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff-options: make --patch a synonym for -pWill Palmer Thu, 13 May 2010 08:59:00 +0000 (09:59 +0100)

diff-options: make --patch a synonym for -p

Here we simply make --patch a synonym for -p, whose mnemonic was "patch"
all along.

Signed-off-by: Will Palmer <wmpalmer@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

for-each-ref: Field with abbreviated objectnameMichael J Gruber Thu, 13 May 2010 12:31:46 +0000 (14:31 +0200)

for-each-ref: Field with abbreviated objectname

Introduce a :short modifier to objectname which outputs the abbreviated
object name.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

hash_object: correction for zero length fileDmitry Potapov Mon, 10 May 2010 21:38:17 +0000 (01:38 +0400)

hash_object: correction for zero length file

The check whether size is zero was done after if size <= SMALL_FILE_SIZE,
as result, zero size case was never triggered. Instead zero length file
was treated as any other small file. This did not caused any problem, but
if we have a special case for size equal to zero, it is better to make it
work and avoid redundant malloc().

Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Use @diff_opts while using format-patchPavan Kumar Sunkara Mon, 10 May 2010 16:41:35 +0000 (18:41 +0200)

gitweb: Use @diff_opts while using format-patch

Make git-format-patch (used by 'patch' and 'patches' views) use the
same rename detection options that git-diff and git-diff-tree (used
by 'commitdiff', 'blobdiff', etc.) use.

Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 12 May 2010 06:04:47 +0000 (23:04 -0700)

Merge branch 'maint'

* maint:
GIT-VERSION-GEN: restrict tags used

GIT-VERSION-GEN: restrict tags usedTay Ray Chuan Wed, 12 May 2010 03:29:20 +0000 (11:29 +0800)

GIT-VERSION-GEN: restrict tags used

Restrict the tags used to generate the version string to those that
begin with "v", since git's tags for git-core (ie. excluding git-gui)
are all of the form "vX.Y...".

This is to avoid using private tags by the user in a clone of the git
code repository, which may break certain machinery (eg. Makefile, gitk).

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 11 May 2010 01:34:03 +0000 (18:34 -0700)

Merge branch 'maint'

* maint:
handle "git --bare init <dir>" properly

tests: chmod +x t5150Jeff King Mon, 10 May 2010 09:51:39 +0000 (05:51 -0400)

tests: chmod +x t5150

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: rename duplicate t4205Jeff King Mon, 10 May 2010 09:47:39 +0000 (05:47 -0400)

tests: rename duplicate t4205

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

handle "git --bare init <dir>" properlyJeff King Mon, 10 May 2010 09:42:06 +0000 (05:42 -0400)

handle "git --bare init <dir>" properly

If we know we are creating a bare repository, we use setenv
to set the GIT_DIR directory to the current directory
(either where we already were, or one we created and chdir'd
into with "git init --bare <dir>").

However, with "git --bare init <dir>" (note the --bare as a
git wrapper option), the setup code actually sets GIT_DIR
for us, but it uses the wrong, original cwd when a directory
is given. Because our setenv does not use the overwrite
flag, it is ignored.

We need to set the overwrite flag, but only when we are
given a directory on the command line. That still allows:

GIT_DIR=foo.git git init --bare

to work. The behavior is changed for:

GIT_DIR=foo.git git init --bare bar.git

which used to create the repository in foo.git, but now will
use bar.git. This is more sane, as command line options
should generally override the environment.

Noticed by Oliver Hoffmann.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: mangle refnames forbidden in gitTorsten Schmutzler Thu, 6 May 2010 20:20:43 +0000 (22:20 +0200)

git-svn: mangle refnames forbidden in git

git-check-ref-format(1) describes names which
cannot be used as refnames for git. Some are
legal branchnames in subversion however.
Mangle the not yet handled cases.

Signed-off-by: Torsten Schmutzler <git-ts@theblacksun.eu>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn: Remove unused use of File::TempÆvar Arnfjörð Bjarmason Sat, 8 May 2010 16:40:41 +0000 (16:40 +0000)

git-svn: Remove unused use of File::Temp

The use line was added in ffe256f9. File::Temp calls were later moved
to Git.pm in 0b19138b, but that commit neglected to remove the
now-redundant import.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn documentation: minor grammar fixÆvar Arnfjörð Bjarmason Fri, 7 May 2010 19:50:03 +0000 (19:50 +0000)

git-svn documentation: minor grammar fix

Use the definite article when talking about a configuration property.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

git svn: avoid uninitialized var in 'reset'Jonathan Nieder Tue, 4 May 2010 23:36:47 +0000 (16:36 -0700)

git svn: avoid uninitialized var in 'reset'

When "git svn reset" is called with an invalid revision, we
bail out and show the user a proper error message instead
of giving them a cryptic one related to git-svn internals.

ref: http://bugs.debian.org/578908
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Reported-by: Jens Seidel <jensseidel@users.sf.net>
Acked-by: Eric Wong <normalperson@yhbt.net>

Start 1.7.2 cycleJunio C Hamano Sun, 9 May 2010 05:58:36 +0000 (22:58 -0700)

Start 1.7.2 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'bg/apply-blank-trailing-context'Junio C Hamano Sun, 9 May 2010 05:37:41 +0000 (22:37 -0700)

Merge branch 'bg/apply-blank-trailing-context'

* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF

Merge branch 'bg/send-email-smtpdomain'Junio C Hamano Sun, 9 May 2010 05:37:34 +0000 (22:37 -0700)

Merge branch 'bg/send-email-smtpdomain'

* bg/send-email-smtpdomain:
send-email: Cleanup smtp-domain and add config
Document send-email --smtp-domain
send-email: Don't use FQDNs without a '.'
send-email: Cleanup { style

Merge branch 'rc/ls-remote-default'Junio C Hamano Sun, 9 May 2010 05:37:28 +0000 (22:37 -0700)

Merge branch 'rc/ls-remote-default'

* rc/ls-remote-default:
ls-remote: fall-back to default remotes when no remote specified

Merge branch 'rc/maint-curl-helper'Junio C Hamano Sun, 9 May 2010 05:37:24 +0000 (22:37 -0700)

Merge branch 'rc/maint-curl-helper'

* rc/maint-curl-helper:
remote-curl: ensure that URLs have a trailing slash
http: make end_url_with_slash() public
t5541-http-push: add test for URLs with trailing slash

Conflicts:
remote-curl.c

Merge branch 'hg/maint-attr-fix'Junio C Hamano Sun, 9 May 2010 05:37:05 +0000 (22:37 -0700)

Merge branch 'hg/maint-attr-fix'

* hg/maint-attr-fix:
attr: Expand macros immediately when encountered.
attr: Allow multiple changes to an attribute on the same line.
attr: Fixed debug output for macro expansion.

Merge branch 'eb/unpretty-b-format'Junio C Hamano Sun, 9 May 2010 05:36:40 +0000 (22:36 -0700)

Merge branch 'eb/unpretty-b-format'

* eb/unpretty-b-format:
Add `%B' in format strings for raw commit body in `git log' and friends

Merge branch 'ab/commit-empty-message'Junio C Hamano Sun, 9 May 2010 05:36:31 +0000 (22:36 -0700)

Merge branch 'ab/commit-empty-message'

* ab/commit-empty-message:
Add option to git-commit to allow empty log messages

Merge branch 'jc/test-sleepless'Junio C Hamano Sun, 9 May 2010 05:36:23 +0000 (22:36 -0700)

Merge branch 'jc/test-sleepless'

* jc/test-sleepless:
war on "sleep" in tests

Merge branch 'jc/maint-reflog-expire-unreachable'Junio C Hamano Sun, 9 May 2010 05:36:16 +0000 (22:36 -0700)

Merge branch 'jc/maint-reflog-expire-unreachable'

* jc/maint-reflog-expire-unreachable:
reflog --expire-unreachable: avoid merge-base computation

Merge branch 'sd/log-decorate'Junio C Hamano Sun, 9 May 2010 05:36:14 +0000 (22:36 -0700)

Merge branch 'sd/log-decorate'

* sd/log-decorate:
log.decorate: only ignore it under "log --pretty=raw"
script with rev-list instead of log
log --pretty/--oneline: ignore log.decorate
log.decorate: usability fixes
Add `log.decorate' configuration variable.
git_config_maybe_bool()

Conflicts:
builtin/log.c

Merge branch 'mh/status-optionally-refresh'Junio C Hamano Sun, 9 May 2010 05:35:39 +0000 (22:35 -0700)

Merge branch 'mh/status-optionally-refresh'

* mh/status-optionally-refresh:
t7508: add a test for "git status" in a read-only repository
git status: refresh the index if possible
t7508: add test for "git status" refreshing the index

Merge branch 'cw/ws-indent-with-tab'Junio C Hamano Sun, 9 May 2010 05:35:35 +0000 (22:35 -0700)

Merge branch 'cw/ws-indent-with-tab'

* cw/ws-indent-with-tab:
whitespace: tests for git-apply --whitespace=fix with tab-in-indent
whitespace: add tab-in-indent support for --whitespace=fix
whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
whitespace: tests for git-diff --check with tab-in-indent error class
whitespace: add tab-in-indent error class
whitespace: we cannot "catch all errors known to git" anymore

Merge branch 'cc/revert-strategy'Junio C Hamano Sun, 9 May 2010 05:34:47 +0000 (22:34 -0700)

Merge branch 'cc/revert-strategy'

* cc/revert-strategy:
revert: add "--strategy" option to choose merge strategy
merge: make function try_merge_command non static
merge: refactor code that calls "git merge-STRATEGY"
revert: refactor merge recursive code into its own function
revert: use strbuf to refactor the code that writes the merge message

Conflicts:
builtin/revert.c

Merge branch 'sc/http-late-auth'Junio C Hamano Sun, 9 May 2010 05:33:16 +0000 (22:33 -0700)

Merge branch 'sc/http-late-auth'

* sc/http-late-auth:
Prompt for a username when an HTTP request 401s

Merge branch 'jk/cached-textconv'Junio C Hamano Sun, 9 May 2010 05:33:08 +0000 (22:33 -0700)

Merge branch 'jk/cached-textconv'

* jk/cached-textconv:
diff: avoid useless filespec population
diff: cache textconv output
textconv: refactor calls to run_textconv
introduce notes-cache interface
make commit_tree a library function

Merge branch 'pc/remove-warn'Junio C Hamano Sun, 9 May 2010 05:32:59 +0000 (22:32 -0700)

Merge branch 'pc/remove-warn'

* pc/remove-warn:
Remove a redundant errno test in a usage of remove_path
Introduce remove_or_warn function
Implement the rmdir_or_warn function
Generalise the unlink_or_warn function

cherry-pick: do not dump core when iconv failsJonathan Nieder Sat, 8 May 2010 23:17:29 +0000 (18:17 -0500)

cherry-pick: do not dump core when iconv fails

When cherry-picking, usually the new and old commit encodings are both
UTF-8. Most old iconv implementations do not support this trivial
conversion, so on old platforms, out->message remains NULL, and later
attempts to read it segfault.

Fix this by noticing the input and output encodings match and skipping
the iconv step, like the other reencode_string() call sites already do.
Also stop segfaulting on other iconv failures: if iconv fails for some
other reason, the best we can do is to pass the old message through.

This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert:
clarify label on conflict hunks, 2010-03-20).

Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: Fix 'clean' target to remove all gitweb build... Ramsay Jones Sat, 8 May 2010 17:36:15 +0000 (18:36 +0100)

Makefile: Fix 'clean' target to remove all gitweb build files

In particular the gitweb/GITWEB-BUILD-OPTIONS file was not being
removed by the main Makefile. However, the gitweb/Makefile has a
'clean' target that correctly removes all the build products.
In order to fix the problem, rather than duplicate the clean-up
instructions, we change the main Makefile so that it delegates
the clean-up actions to the gitweb Makefile.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/config.txt: GIT_NOTES_REWRITE_REF overrid... Leif Arne Storset Wed, 5 May 2010 14:16:25 +0000 (16:16 +0200)

Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef

The documentation erroneously mentions the GIT_NOTES_REWRITE_REF
override in the description of notes.rewrite.<command>. Move it
under notes.rewriteRef where it belongs.

Signed-off-by: Leif Arne Storset <lstorset@opera.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

adapt request-pull tests for new pull request formatJonathan Nieder Sat, 24 Apr 2010 12:29:52 +0000 (07:29 -0500)

adapt request-pull tests for new pull request format

10eb0007 (request-pull: avoid mentioning that the start point is a
single commit, 2010-01-29), changed the pull request format, so the
test needs some changes to still pass:

- tolerate a missing blank line between “in the git repository at:”
and the name of repository and branch

- recognize subject and date in the new request format

- update the expected request template to match the new format

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jn/maint-request-pull' into jn/request... Junio C Hamano Sat, 8 May 2010 04:32:56 +0000 (21:32 -0700)

Merge branch 'jn/maint-request-pull' into jn/request-pull

t5150: protect backslash with backslash in shellJunio C Hamano Sat, 8 May 2010 04:29:50 +0000 (21:29 -0700)

t5150: protect backslash with backslash in shell

At least /bin/sh on FreeBSD 8 interprets backslash followed by newline in an
unquoted here text as "empty".

Signed-off-by: Junio C Hamano <gitster@pobox.com>

blame-options.txt: Add default value for `-M/-C` options.Bo Yang Fri, 7 May 2010 04:51:57 +0000 (21:51 -0700)

blame-options.txt: Add default value for `-M/-C` options.

Both `-M` and `-C` have default values and the <num> argument
the last `-C` option takes effect.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make git log --follow find copies among unmodified... Bo Yang Fri, 7 May 2010 04:52:29 +0000 (21:52 -0700)

Make git log --follow find copies among unmodified files.

'git log --follow <path>' don't track copies from unmodified
files, and this patch fix it.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make diffcore_std only can run once before a diff_flushBo Yang Fri, 7 May 2010 04:52:28 +0000 (21:52 -0700)

Make diffcore_std only can run once before a diff_flush

When file renames/copies detection is turned on, the
second diffcore_std will degrade a 'C' pair to a 'R' pair.

And this may happen when we run 'git log --follow' with
hard copies finding. That is, the try_to_follow_renames()
will run diffcore_std to find the copies, and then
'git log' will issue another diffcore_std, which will reduce
'src->rename_used' and recognize this copy as a rename.
This is not what we want.

So, I think we really don't need to run diffcore_std more
than one time.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add a macro DIFF_QUEUE_CLEAR.Bo Yang Fri, 7 May 2010 04:52:27 +0000 (21:52 -0700)

Add a macro DIFF_QUEUE_CLEAR.

Refactor the diff_queue_struct code, this macro help
to reset the structure.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

wt-status: take advice.statusHints seriouslyMichael J Gruber Thu, 22 Apr 2010 20:30:20 +0000 (22:30 +0200)

wt-status: take advice.statusHints seriously

Currently, status gives a lot of hints even when advice.statusHints is
false. Change this so that all hints depend on the config variable.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7508: test advice.statusHintsMichael J Gruber Thu, 22 Apr 2010 20:30:19 +0000 (22:30 +0200)

t7508: test advice.statusHints

edf563f (status: make "how to stage" messages optional, 2009-09-09)
introduced advice.statusHints without tests. Add a few tests to describe
and test the status quo.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-lib: some shells do not let $? propagate into... Jonathan Nieder Thu, 6 May 2010 08:41:10 +0000 (03:41 -0500)

test-lib: some shells do not let $? propagate into an eval

In 3bf7886 (test-lib: Let tests specify commands to be run at end of
test, 2010-05-02), the git test harness learned to run cleanup
commands unconditionally at the end of a test. During each test,
the intended cleanup actions are collected in the test_cleanup variable
and evaluated. That variable looks something like this:

eval_ret=$?; clean_something && (exit "$eval_ret")
eval_ret=$?; clean_something_else && (exit "$eval_ret")
eval_ret=$?; final_cleanup && (exit "$eval_ret")
eval_ret=$?

All cleanup actions are run unconditionally but if one of them fails
it is properly reported through $eval_ret.

On FreeBSD, unfortunately, $? is set at the beginning of an ‘eval’
to 0 instead of the exit status of the previous command. This results
in tests using test_expect_code appearing to fail and all others
appearing to pass, unless their cleanup fails. Avoid the problem by
setting eval_ret before the ‘eval’ begins.

Thanks to Jeff King for the explanation.

Cc: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j6t@kdbg.org>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pretty: Respect --abbrev optionWill Palmer Tue, 4 May 2010 03:18:57 +0000 (22:18 -0500)

pretty: Respect --abbrev option

Prior to this, the output of git log -1 --format=%h was always 7
characters long, without regard to whether --abbrev had been passed.

Signed-off-by: Will Palmer <wmpalmer@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

shortlog: Document and test --format optionJonathan Nieder Tue, 4 May 2010 02:59:55 +0000 (21:59 -0500)

shortlog: Document and test --format option

Do not document the --pretty synonym, since it takes too long to
explain the name to people.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4201 (shortlog): Test output format with multiple... Jonathan Nieder Tue, 4 May 2010 02:58:04 +0000 (21:58 -0500)

t4201 (shortlog): Test output format with multiple authors

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4201 (shortlog): guard setup with test_expect_successJonathan Nieder Tue, 4 May 2010 02:57:36 +0000 (21:57 -0500)

t4201 (shortlog): guard setup with test_expect_success

Follow the current prevailing style. This also has the benefit of
capturing any stray output and noticing if any of the setup commands
start failing.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/shortlog: scripted users should not rely... Jonathan Nieder Tue, 4 May 2010 02:57:10 +0000 (21:57 -0500)

Documentation/shortlog: scripted users should not rely on implicit HEAD

When passed no revision arguments, ‘git shortlog’ reads a log from
stdin if and only if stdin is not a tty. So scripts that need to
function identically when standard input is a terminal (as when run
interactively) and not (as when run through a cron job) should either
supply a log themselves or specify the desired revisions explicitly.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-lib: Let tests specify commands to be run at end... Jonathan Nieder Sun, 2 May 2010 08:53:41 +0000 (03:53 -0500)

test-lib: Let tests specify commands to be run at end of test

Certain actions can imply that if the test fails early, recovery from
within other tests is too much to expect:

- creating unwritable directories, like the EACCESS test in t0001-init
- setting unusual configuration, like user.signingkey in t7004-tag
- crashing and leaving the index lock held, like t3600-rm once did

Some test scripts work around this by running cleanup actions outside
the supervision of the test harness, with the unfortunate consequence
that those commands are not appropriately echoed and their output not
suppressed. Others explicitly save exit status, clean up, and then
reset the exit status within the tests, which has excellent behavior
but makes the tests hard to read. Still others ignore the problem.

Allow tests a fourth option: by calling this function, tests can
stack up commands they would like to be run to clean up.

Commands passed to test_when_finished during a test are
unconditionally run in the test environment immediately before the
test is completed, in last-in-first-out order. If some cleanup
command fails, then the other cleanup commands are still run before
the failure is reported and the test script allowed to continue.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.7.0' into maintJunio C Hamano Tue, 4 May 2010 22:20:47 +0000 (15:20 -0700)

Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
remove ecb parameter from xdi_diff_outf()

remove ecb parameter from xdi_diff_outf()René Scharfe Tue, 4 May 2010 20:41:34 +0000 (22:41 +0200)

remove ecb parameter from xdi_diff_outf()

xdi_diff_outf() overrides the structure members of its last parameter,
ignoring any value that callers pass in. It's no surprise then that all
callers pass a pointer to an uninitialized structure. They also don't
read it after the call, so the parameter is neither used for input nor
for output. Turn it into a local variable of xdi_diff_outf().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-send-email: Add "Use gmail as the... Ping Yin Sat, 24 Apr 2010 07:34:02 +0000 (15:34 +0800)

Documentation/git-send-email: Add "Use gmail as the smtp server"

Signed-off-by: Ping Yin <pkufranky@gmail.com>
Acked by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>