gitweb.git
Merge branch 'ly/mktree-using-strbuf'Junio C Hamano Sat, 12 Nov 2011 05:34:06 +0000 (21:34 -0800)

Merge branch 'ly/mktree-using-strbuf'

* ly/mktree-using-strbuf:
mktree: fix a memory leak in write_tree()

Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Junio C Hamano Thu, 10 Nov 2011 17:10:51 +0000 (09:10 -0800)

Merge "Move 'builtin-*' into a 'builtin/' subdirectory"

Merge 'build-in git-mktree'Junio C Hamano Thu, 10 Nov 2011 17:05:31 +0000 (09:05 -0800)

Merge 'build-in git-mktree'

* commit '633e3556ccbc': (5835 commits)
build-in git-mktree
allow -t abbreviation for --track in git branch
gitweb: Remove function prototypes (cleanup)
Documentation: cloning to empty directory is allowed
Clarify kind of conflict in merge-one-file helper
git config: clarify --add and --get-color
archive-tar.c: squelch a type mismatch warning
Start 1.6.4 development
Start 1.6.3.1 maintenance series.
GIT 1.6.3
t4029: use sh instead of bash
t4200: convert sed expression which operates on non-text file to perl
t4200: remove two unnecessary lines
t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
t4118: avoid sed invocation on file without terminating newline
t4118: add missing '&&'
t8005: use egrep when extended regular expressions are required
git-clean doc: the command only affects paths under $(cwd)
improve error message in config.c
t4018-diff-funcname: add cpp xfuncname pattern to syntax test
...

mktree: fix a memory leak in write_tree()Liu Yuan Thu, 10 Nov 2011 08:39:22 +0000 (16:39 +0800)

mktree: fix a memory leak in write_tree()

We forget to call strbuf_release to release the buf memory.

Signed-off-by: Liu Yuan <tailai.ly@taobao.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit-tree: update the command line parsingJunio C Hamano Wed, 9 Nov 2011 19:33:55 +0000 (11:33 -0800)

commit-tree: update the command line parsing

We have kept the original "git commit-tree <tree> -p <parent> ..." syntax
forever, but "git commit-tree -p <parent> -p <parent> ... <tree>" would be
more intuitive way to spell it. Dashed flags along with their arguments
come first and then the "thing" argument after the flags.

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

commit: teach --amend to carry forward extra headersJunio C Hamano Tue, 8 Nov 2011 23:38:07 +0000 (15:38 -0800)

commit: teach --amend to carry forward extra headers

After running "git pull $there for-linus" to merge a signed tag, the
integrator may need to amend the resulting merge commit to fix typoes
in it. Teach --amend option to read the existing extra headers, and
carry them forward.

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

merge: force edit and no-ff mode when merging a tag... Junio C Hamano Tue, 8 Nov 2011 00:29:34 +0000 (16:29 -0800)

merge: force edit and no-ff mode when merging a tag object

Now that we allow pulling a tag from the remote site to validate the
authenticity, we should give the user the final chance to verify and edit
the merge message. The integrator is expected to leave a meaningful merge
commit log in the history. Disallow fast-forwarding in such a case to
ensure that a merge commit is always recorded.

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

commit: copy merged signed tags to headers of merge... Junio C Hamano Tue, 8 Nov 2011 00:21:32 +0000 (16:21 -0800)

commit: copy merged signed tags to headers of merge commit

Now MERGE_HEAD records the tag objects without peeling, we could record
the result of manual conflict resolution via "git commit" without losing
the tag information. Introduce a new "mergetag" multi-line header field to
the commit object, and use it to store the entire contents of each signed
tag merged.

A commit header that has a multi-line payload begins with the header tag
(e.g. "mergetag" in this case), SP, the first line of payload, LF, and all
the remaining lines have a SP inserted at the beginning.

In hindsight, it would have been better to make "merge --continue" as the
way to continue from such an interrupted merge, not "commit", but this is
a backward compatibility baggage we would need to carry around for now.

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

Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano Wed, 9 Nov 2011 13:46:39 +0000 (05:46 -0800)

Merge branch 'sn/complete-bash-wo-process-subst'

* sn/complete-bash-wo-process-subst:
completion: don't leak variable from the prompt into environment

completion: don't leak variable from the prompt into... SZEDER Gábor Wed, 9 Nov 2011 10:02:50 +0000 (11:02 +0100)

completion: don't leak variable from the prompt into environment

Commit e5b8eebc (completion: fix issue with process substitution not
working on Git for Windows, 2011-10-26) introduced a new variable in
__git_ps1_show_upstream(), but didn't declare it as local to prevent it
from leaking into the environment.

We may want to rewrite it like the following, but that can wait until the
next cycle.

while read key value
do
...
done <<-EOF
$(git config -z --get-regexp ...)
EOF

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

request-pull: use the annotated tag contentsJunio C Hamano Wed, 9 Nov 2011 13:05:00 +0000 (05:05 -0800)

request-pull: use the annotated tag contents

The integrator tool will start allowing to pull a signed or an annotated
tag, i.e.

$ git pull $there tags/for-linus

and the description in the tag is used to convey a meaningful message from
the lieutenant to the integrator to justify the history being pulled.

Include the message in the pull request e-mail, as the same information is
useful in this context, too. It would encourage the lieutenants to write
meaningful messages in their signed tags.

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

Update draft release notes to 1.7.8Junio C Hamano Wed, 9 Nov 2011 00:42:33 +0000 (16:42 -0800)

Update draft release notes to 1.7.8

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

Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano Wed, 9 Nov 2011 00:40:31 +0000 (16:40 -0800)

Merge branch 'jc/remote-setbranches-usage-fix'

* jc/remote-setbranches-usage-fix:
remote: fix set-branches usage

Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano Wed, 9 Nov 2011 00:40:27 +0000 (16:40 -0800)

Merge branch 'fc/remote-seturl-usage-fix'

* fc/remote-seturl-usage-fix:
remote: fix remote set-url usage

Sync with 1.7.7.3Junio C Hamano Wed, 9 Nov 2011 00:38:14 +0000 (16:38 -0800)

Sync with 1.7.7.3

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

Git 1.7.7.3 v1.7.7.3Junio C Hamano Wed, 9 Nov 2011 00:37:00 +0000 (16:37 -0800)

Git 1.7.7.3

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

Merge branch 'jc/maint-remove-renamed-ref' into maintJunio C Hamano Wed, 9 Nov 2011 00:35:53 +0000 (16:35 -0800)

Merge branch 'jc/maint-remove-renamed-ref' into maint

* jc/maint-remove-renamed-ref:
branch -m/-M: remove undocumented RENAMED-REF

Conflicts:
refs.c

Merge branch 'jm/maint-gitweb-filter-forks-fix' into... Junio C Hamano Wed, 9 Nov 2011 00:26:50 +0000 (16:26 -0800)

Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint

* jm/maint-gitweb-filter-forks-fix:
gitweb: fix regression when filtering out forks

Merge branch 'dm/pack-objects-update' into maintJunio C Hamano Wed, 9 Nov 2011 00:26:45 +0000 (16:26 -0800)

Merge branch 'dm/pack-objects-update' into maint

* 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

docs: Update install-doc-quickJunio C Hamano Tue, 8 Nov 2011 18:17:40 +0000 (10:17 -0800)

docs: Update install-doc-quick

The preformatted documentation pages live in their own repositories
these days. Adjust the installation procedure to the updated layout.

Tested-by: Stefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

docs: don't mention --quiet or --exit-code in git-log(1)Jeff King Tue, 8 Nov 2011 21:29:30 +0000 (16:29 -0500)

docs: don't mention --quiet or --exit-code in git-log(1)

These are diff-options, but they don't actually make sense
in the context of log.

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

merge: record tag objects without peeling in MERGE_HEADJunio C Hamano Mon, 7 Nov 2011 22:45:10 +0000 (14:45 -0800)

merge: record tag objects without peeling in MERGE_HEAD

Otherwise, "git commit" wouldn't have a way to tell that we were in the
middle of merging an annotated or signed tag, not a plain commit, after
"git merge" stops to ask the user to resolve conflicts.

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

merge: make usage of commit->util more extensibleJunio C Hamano Mon, 7 Nov 2011 21:26:22 +0000 (13:26 -0800)

merge: make usage of commit->util more extensible

The merge-recursive code uses the commit->util field directly to annotate
the commit objects given from the command line, i.e. the remote heads to
be merged, with a single string to be used to describe it in its trace
messages and conflict markers.

Correct this short-signtedness by redefining the field to be a pointer to
a structure "struct merge_remote_desc" that later enhancements can add
more information. Store the original objects we were told to merge in a
field "obj" in this struct, so that we can recover the tag we were told to
merge.

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

fmt-merge-msg: Add contents of merged tag in the merge... Junio C Hamano Sat, 5 Nov 2011 04:06:30 +0000 (21:06 -0700)

fmt-merge-msg: Add contents of merged tag in the merge message

When a contributor asks the integrator to merge her history, a signed tag
can be a good vehicle to communicate the authenticity of the request while
conveying other information such as the purpose of the topic.

E.g. a signed tag "for-linus" can be created, and the integrator can run:

$ git pull git://example.com/work.git/ for-linus

This would allow the integrator to run "git verify-tag FETCH_HEAD" to
validate the signed tag.

Update fmt-merge-msg so that it pre-fills the merge message template with
the body (but not signature) of the tag object to help the integrator write
a better merge message, in the same spirit as the existing merge.log summary
lines.

The message that comes from GPG signature validation is also included in
the merge message template to help the integrator verify it, but they are
prefixed with "#" to make them comments.

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

reachable: per-object progressJeff King Tue, 8 Nov 2011 05:37:00 +0000 (00:37 -0500)

reachable: per-object progress

The current progress code really just counts commits.
This patch makes it count all objects, giving us a "total"
count close to what a repack would show. This is nice when
using "git gc", which will usually have just repacked the
whole repo.

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

prune: handle --progress/no-progressJeff King Tue, 8 Nov 2011 05:34:08 +0000 (00:34 -0500)

prune: handle --progress/no-progress

And have "git gc" pass no-progress when quiet.

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

prune: show progress while marking reachable objectsNguyễn Thái Ngọc Duy Sat, 5 Nov 2011 12:00:08 +0000 (19:00 +0700)

prune: show progress while marking reachable objects

prune already shows progress meter while pruning. The marking part may
take a few seconds or more, depending on repository size. Show
progress meter during this time too.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.7.8-rc1 v1.7.8-rc1Junio C Hamano Tue, 8 Nov 2011 00:48:34 +0000 (16:48 -0800)

Git 1.7.8-rc1

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

Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano Tue, 8 Nov 2011 00:43:19 +0000 (16:43 -0800)

Merge branch 'ss/blame-textconv-fake-working-tree'

* ss/blame-textconv-fake-working-tree:
blame.c: Properly initialize strbuf after calling textconv_object(), again

blame.c: Properly initialize strbuf after calling textc... Sebastian Schuberth Mon, 7 Nov 2011 17:33:34 +0000 (18:33 +0100)

blame.c: Properly initialize strbuf after calling textconv_object(), again

2564aa4 started to initialize buf.alloc, but that should actually be one
more byte than the string length due to the trailing \0. Also, do not
modify buf.alloc out of the strbuf code. Use the existing strbuf_attach
instead.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fmt-merge-msg: package options into a structureJunio C Hamano Sat, 5 Nov 2011 00:35:42 +0000 (17:35 -0700)

fmt-merge-msg: package options into a structure

This way new features can be added more easily

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

fmt-merge-msg: avoid early returnsJunio C Hamano Sat, 5 Nov 2011 00:00:03 +0000 (17:00 -0700)

fmt-merge-msg: avoid early returns

In various places in the codepath, the program tries to return early
assuming there is no more work needed. That is generally untrue when
over time new features are added.

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

refs DWIMmery: use the same rule for both "git fetch... Junio C Hamano Fri, 4 Nov 2011 21:14:05 +0000 (14:14 -0700)

refs DWIMmery: use the same rule for both "git fetch" and others

"git log frotz" can DWIM to "refs/remotes/frotz/HEAD", but in the remote
access context, "git fetch frotz" to fetch what the other side happened to
have fetched from what it calls 'frotz' (which may not have any relation
to what we consider is 'frotz') the last time would not make much sense,
so the fetch rules table did not include "refs/remotes/%.*s/HEAD".

When the user really wants to, "git fetch $there remotes/frotz/HEAD" would
let her do so anyway, so this is not about safety or security; it merely
is about confusion avoidance and discouraging meaningless usage.

Specifically, it is _not_ about ambiguity avoidance. A name that would
become ambiguous if we use the same rules table for both fetch and local
rev-parse would be ambiguous locally at the remote side.

So for the same reason as we added rule to allow "git fetch $there v1.0"
instead of "git fetch $there tags/v1.0" in the previous commit, here is a
bit longer rope for the users, which incidentally simplifies our code.

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

fetch: allow "git fetch $there v1.0" to fetch a tagJunio C Hamano Fri, 4 Nov 2011 21:05:22 +0000 (14:05 -0700)

fetch: allow "git fetch $there v1.0" to fetch a tag

You can already do so with "git fetch $there tags/v1.0" but if it is not
ambiguous there is no reason to force users to type more.

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

merge: notice local merging of tags and keep it unwrappedJunio C Hamano Sat, 5 Nov 2011 04:31:28 +0000 (21:31 -0700)

merge: notice local merging of tags and keep it unwrapped

This also updates the autogenerated merge title message from "merge commit X"
to "merge tag X", and its effect can be seen in the changes to the test suite.

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

pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason Sun, 6 Nov 2011 09:50:10 +0000 (10:50 +0100)

pull: introduce a pull.rebase option to enable --rebase

Currently we either need to set branch.<name>.rebase for existing
branches if we'd like "git pull" to mean "git pull --rebase", or have
the forethought of setting "branch.autosetuprebase" before we create
the branch.

Introduce a "pull.rebase" option to globally configure "git pull" to
mean "git pull --rebase" for any branch.

This option will be considered at a lower priority than
branch.<name>.rebase, i.e. we could set pull.rebase=true and
branch.<name>.rebase=false and the latter configuration option would
win.

Reviewed-by: Sverre Rabbelier <srabbelier@gmail.com>
Reviewed-by: Fernando Vezzosi <buccia@repnz.net>
Reviewed-by: Eric Herman <eric@freesa.org>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Liked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ab/i18n-test-fix'Junio C Hamano Mon, 7 Nov 2011 05:22:22 +0000 (21:22 -0800)

Merge branch 'ab/i18n-test-fix'

* ab/i18n-test-fix:
t/t7508-status.sh: use test_i18ncmp
t/t6030-bisect-porcelain.sh: use test_i18ngrep

Merge branch 'sn/http-auth-with-netrc-fix'Junio C Hamano Mon, 7 Nov 2011 05:22:19 +0000 (21:22 -0800)

Merge branch 'sn/http-auth-with-netrc-fix'

* sn/http-auth-with-netrc-fix:
http: don't always prompt for password

Merge branch 'pw/p4-appledouble-fix'Junio C Hamano Mon, 7 Nov 2011 05:21:57 +0000 (21:21 -0800)

Merge branch 'pw/p4-appledouble-fix'

* pw/p4-appledouble-fix:
git-p4: ignore apple filetype

remote: fix remote set-url usageFelipe Contreras Mon, 7 Nov 2011 03:36:57 +0000 (05:36 +0200)

remote: fix remote set-url usage

Bad copy-paste.

Otherwise the help text for "git remote set-url --help" would show help
for "git remote update" subcommand.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote: fix set-branches usageJunio C Hamano Mon, 7 Nov 2011 05:12:59 +0000 (21:12 -0800)

remote: fix set-branches usage

Bad copy-paste.

Otherwise "git remote set-branches" without necessary argument
will result in an error message and help for set-url subcommand.

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

fsck: print progressNguyễn Thái Ngọc Duy Mon, 7 Nov 2011 02:59:26 +0000 (09:59 +0700)

fsck: print progress

fsck is usually a long process and it would be nice if it prints
progress from time to time.

Progress meter is not printed when --verbose is given because
--verbose prints a lot, there's no need for "alive" indicator.
Progress meter may provide "% complete" information but it would
be lost anyway in the flood of text.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fsck: avoid reading every object twiceNguyễn Thái Ngọc Duy Mon, 7 Nov 2011 02:59:25 +0000 (09:59 +0700)

fsck: avoid reading every object twice

During verify_pack() all objects are read for SHA-1 check. Then
fsck_sha1() is called on every object, which read the object again
(fsck_sha1 -> parse_object -> read_sha1_file).

Avoid reading an object twice, do fsck_sha1 while we have an object
uncompressed data in verify_pack.

On git.git, with this patch I got:

$ /usr/bin/time ./git fsck >/dev/null
98.97user 0.90system 1:40.01elapsed 99%CPU (0avgtext+0avgdata 616624maxresident)k
0inputs+0outputs (0major+194186minor)pagefaults 0swaps

Without it:

$ /usr/bin/time ./git fsck >/dev/null
231.23user 2.35system 3:53.82elapsed 99%CPU (0avgtext+0avgdata 636688maxresident)k
0inputs+0outputs (0major+461629minor)pagefaults 0swaps

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

verify_packfile(): check as many object as possible... Nguyễn Thái Ngọc Duy Mon, 7 Nov 2011 02:59:24 +0000 (09:59 +0700)

verify_packfile(): check as many object as possible in a pack

verify_packfile() checks for whole pack integerity first, then each
object individually. Once we get past whole pack check, we can
identify all objects in the pack. If there's an error with one object,
we should continue to check the next objects to salvage as many
objects as possible instead of stopping the process.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fsck: return error code when verify_pack() goes wrongNguyễn Thái Ngọc Duy Mon, 7 Nov 2011 02:59:23 +0000 (09:59 +0700)

fsck: return error code when verify_pack() goes wrong

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cast variable in call to free() in builtin/diff.c and... Ævar Arnfjörð Bjarmason Sun, 6 Nov 2011 12:06:23 +0000 (13:06 +0100)

cast variable in call to free() in builtin/diff.c and submodule.c

Both of these free() calls are freeing a "const unsigned char (*)[20]"
type while free() expects a "void *". This results in the following
warning under clang 2.9:

builtin/diff.c:185:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers
free(parent);
^~~~~~

submodule.c:394:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers
free(parents);
^~~~~~~

This free()-ing without a cast was added by Jim Meyering to
builtin/diff.c in v1.7.6-rc3~4 and later by Fredrik Gustafsson in
submodule.c in v1.7.7-rc1~25^2.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

apply: get rid of useless x < 0 comparison on a size_t... Ævar Arnfjörð Bjarmason Sun, 6 Nov 2011 12:06:22 +0000 (13:06 +0100)

apply: get rid of useless x < 0 comparison on a size_t type

According to the C standard size_t is always unsigned, therefore the
comparison "n1 < 0 || n2 < 0" when n1 and n2 are size_t will always be
false.

This was raised by clang 2.9 which throws this warning when compiling
apply.c:

builtin/apply.c:253:9: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
if (n1 < 0 || n2 < 0)
~~ ^ ~
builtin/apply.c:253:19: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
if (n1 < 0 || n2 < 0)
~~ ^ ~

This check was originally added in v1.6.5-rc0~53^2 by Giuseppe Bilotta
while adding an option to git-apply to ignore whitespace differences.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4: ignore apple filetypePete Wyckoff Sat, 5 Nov 2011 17:36:07 +0000 (13:36 -0400)

git-p4: ignore apple filetype

Revert 97a21ca (git-p4: stop ignoring apple filetype, 2011-10-16)
and add a test case.

Reported-by: Michael Wookey <michaelwookey@gmail.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t7508-status.sh: use test_i18ncmpÆvar Arnfjörð Bjarmason Sat, 5 Nov 2011 17:28:43 +0000 (17:28 +0000)

t/t7508-status.sh: use test_i18ncmp

Change a i18n-specific comparison in t/t7508-status.sh to use
test_i18ncmp instead. This was introduced in v1.7.6.3~11^2 and has
been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t6030-bisect-porcelain.sh: use test_i18ngrepÆvar Arnfjörð Bjarmason Sat, 5 Nov 2011 17:28:42 +0000 (17:28 +0000)

t/t6030-bisect-porcelain.sh: use test_i18ngrep

Change a i18n-specific grep in t/t6030-bisect-porcelain.sh to use
test_i18ngrep instead. This was introduced in v1.7.7.2~5^2~11 and has
been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Support sizes >=2G in various config options accepting... Nick Alcock Wed, 2 Nov 2011 15:46:23 +0000 (15:46 +0000)

Support sizes >=2G in various config options accepting 'g' sizes.

The config options core.packedGitWindowSize, core.packedGitLimit,
core.deltaBaseCacheLimit, core.bigFileThreshold, pack.windowMemory and
pack.packSizeLimit all claim to support suffixes up to and including
'g'. This implies that they should accept sizes >=2G on 64-bit
systems: certainly, specifying a size of 3g should not silently be
translated to zero or transformed into a large negative value due to
integer overflow. However, due to use of git_config_int() rather than
git_config_ulong(), that is exactly what happens:

% git config core.bigFileThreshold 2g
% git gc --aggressive # with extra debugging code to print out
# core.bigfilethreshold after parsing
bigfilethreshold: -2147483648
[...]

This is probably irrelevant for core.deltaBaseCacheLimit, but is
problematic for the other values. (It is particularly problematic for
core.packedGitLimit, which can't even be set to its default value in
the config file due to this bug.)

This fixes things for 32-bit platforms as well. They get the usual bad
config error if an overlarge value is specified, e.g.:

fatal: bad config value for 'core.bigfilethreshold' in /home/nix/.gitconfig

This is detected in all cases, even if the 32-bit platform has no size
larger than 'long'. For signed integral configuration values, we also
detect the case where the value is too large for the signed type but
not the unsigned type.

Signed-off-by: Nick Alcock <nix@esperi.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Compatibility: declare strtoimax() under NO_STRTOUMAXJohannes Sixt Sat, 5 Nov 2011 15:37:34 +0000 (16:37 +0100)

Compatibility: declare strtoimax() under NO_STRTOUMAX

The previous one introduced an implementation of the function, but forgot
to add a declaration.

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

fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds Thu, 3 Nov 2011 02:19:34 +0000 (19:19 -0700)

fetch: do not store peeled tag object names in FETCH_HEAD

We do not want to record tags as parents of a merge when the user does
"git pull $there tag v1.0" to merge tagged commit, but that is not a good
enough excuse to peel the tag down to commit when storing in FETCH_HEAD.
The caller of underlying "git fetch $there tag v1.0" may have other uses
of information contained in v1.0 tag in mind.

[jc: the test adjustment is to update for the new expectation]

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

Split GPG interface into its own helper libraryJunio C Hamano Thu, 8 Sep 2011 04:19:47 +0000 (21:19 -0700)

Split GPG interface into its own helper library

This mostly moves existing code from builtin/tag.c (for signing)
and builtin/verify-tag.c (for verifying) to a new gpg-interface.c
file to provide a more generic library interface.

- sign_buffer() takes a payload strbuf, a signature strbuf, and a signing
key, runs "gpg" to produce a detached signature for the payload, and
appends it to the signature strbuf. The contents of a signed tag that
concatenates the payload and the detached signature can be produced by
giving the same strbuf as payload and signature strbuf.

- verify_signed_buffer() takes a payload and a detached signature as
<ptr, len> pairs, and runs "gpg --verify" to see if the payload matches
the signature. It can optionally capture the output from GPG to allow
the callers to pretty-print it in a way more suitable for their
contexts.

"verify-tag" (aka "tag -v") used to save the whole tag contents as if it
is a detached signature, and fed gpg the payload part of the tag. It
relied on gpg to fail when the given tag is not signed but just is
annotated. The updated run_gpg_verify() function detects the lack of
detached signature in the input, and errors out without bothering "gpg".

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

git-gui: don't warn for detached head when rebasingBert Wesarg Sat, 22 Oct 2011 19:39:40 +0000 (21:39 +0200)

git-gui: don't warn for detached head when rebasing

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

git-gui: make config gui.warndetachedcommit a booleanBert Wesarg Sat, 22 Oct 2011 19:39:39 +0000 (21:39 +0200)

git-gui: make config gui.warndetachedcommit a boolean

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

git-gui: add config value gui.diffopts for passing... Tilman Vogel Fri, 21 Jan 2011 10:59:45 +0000 (11:59 +0100)

git-gui: add config value gui.diffopts for passing additional diff options

Signed-off-by: Tilman Vogel <tilman.vogel@web.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

http: drop "local" member from request structJeff King Fri, 4 Nov 2011 17:53:33 +0000 (13:53 -0400)

http: drop "local" member from request struct

This is a FILE pointer in the case that we are sending our
output to a file. We originally used it to run ftell() to
determine whether data had been written to our file during
our last call to curl. However, as of the last patch, we no
longer care about that flag anymore. All uses of this struct
member are now just book-keeping that can go away.

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

http.c: Rely on select instead of tracking whether... Mika Fischer Fri, 4 Nov 2011 14:19:27 +0000 (15:19 +0100)

http.c: Rely on select instead of tracking whether data was received

Since now select is used with the file descriptors of the http connections,
tracking whether data was received recently (and trying to read more in
that case) is no longer necessary. Instead, always call select and rely on
it to return as soon as new data can be read.

Signed-off-by: Mika Fischer <mika.fischer@zoopnet.de>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http.c: Use timeout suggested by curl instead of fixed... Mika Fischer Fri, 4 Nov 2011 14:19:26 +0000 (15:19 +0100)

http.c: Use timeout suggested by curl instead of fixed 50ms timeout

Recent versions of curl can suggest a period of time the library user
should sleep and try again, when curl is blocked on reading or writing
(or connecting). Use this timeout instead of always sleeping for 50ms.

Signed-off-by: Mika Fischer <mika.fischer@zoopnet.de>
Helped-by: Daniel Stenberg <daniel@haxx.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http.c: Use curl_multi_fdset to select on curl fds... Mika Fischer Fri, 4 Nov 2011 14:19:25 +0000 (15:19 +0100)

http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping

Instead of sleeping unconditionally for a 50ms, when no data can be read
from the http connection(s), use curl_multi_fdset() to obtain the actual
file descriptors of the open connections and use them in the select call.
This way, the 50ms sleep is interrupted when new data arrives.

Signed-off-by: Mika Fischer <mika.fischer@zoopnet.de>
Helped-by: Daniel Stenberg <daniel@haxx.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http: don't always prompt for passwordStefan Naewe Fri, 4 Nov 2011 07:03:08 +0000 (08:03 +0100)

http: don't always prompt for password

When a username is already specified at the beginning of any HTTP
transaction (e.g. "git push https://user@hosting.example.com/project.git"
or "git ls-remote https://user@hosting.example.com/project.git"), the code
interactively asks for a password before calling into the libcurl library.
It is very likely that the reason why user included the username in the
URL is because the user knows that it would require authentication to
access the resource. Asking for the password upfront would save one
roundtrip to get a 401 response, getting the password and then retrying
the request. This is a reasonable optimization.

HOWEVER.

This is done even when $HOME/.netrc might have a corresponding entry to
access the site, or the site does not require authentication to access the
resource after all. But neither condition can be determined until we call
into libcurl library (we do not read and parse $HOME/.netrc ourselves). In
these cases, the user is forced to respond to the password prompt, only to
give a password that is not used in the HTTP transaction. If the password
is in $HOME/.netrc, an empty input would later let the libcurl layer to
pick up the password from there, and if the resource does not require
authentication, any input would be taken and then discarded without
getting used. It is wasteful to ask this unused information to the end
user.

Reduce the confusion by not trying to optimize for this case and always
incur roundtrip penalty. An alternative might be to document this and keep
this round-trip optimization as-is.

Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-gui: sort the numeric ansi codesPat Thoyts Fri, 19 Nov 2010 22:22:20 +0000 (22:22 +0000)

git-gui: sort the numeric ansi codes

This ensures that underline does not conflict with inverse colors.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

git-gui: support underline style when parsing diff... Pat Thoyts Fri, 19 Nov 2010 10:00:49 +0000 (10:00 +0000)

git-gui: support underline style when parsing diff output

Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

receive-pack: do not expect object 0{40} to existJunio C Hamano Thu, 3 Nov 2011 19:15:08 +0000 (12:15 -0700)

receive-pack: do not expect object 0{40} to exist

When pushing to delete a ref, it uses 0{40} as an object name to signal
that the request is a deletion. We shouldn't trigger "deletion of a
corrupt ref" warning in such a case, which was designed to notice that a
ref points at an object that is truly missing from the repository.

Reported-by: Stefan Näwe
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add strtoimax() compatibility function.Nick Alcock Wed, 2 Nov 2011 15:46:22 +0000 (15:46 +0000)

Add strtoimax() compatibility function.

Since systems that omit strtoumax() will likely omit strtomax() too, and
likewise for strtoull() and strtoll(), we arrange for the make variables
NO_STRTOUMAX and NO_STRTOULL to cover both the signed and unsigned
functions, and define compatibility implementations for them.

Signed-off-by: Nick Alcock <nix@esperi.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3200: add test case for 'branch -m'Stefan Naewe Wed, 2 Nov 2011 15:07:05 +0000 (16:07 +0100)

t3200: add test case for 'branch -m'

Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

branch -m: handle no arg properlyTay Ray Chuan Wed, 2 Nov 2011 16:17:12 +0000 (00:17 +0800)

branch -m: handle no arg properly

Modify the option parsing heuristic to handle all -m (rename) cases,
including the no-arg case.

Previously, this "fell through" to the (argc <= 2) case and caused
segfault.

Reported-by: Stefan Näwe <stefan.naewe@atlas-elektronik.com>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.8Junio C Hamano Tue, 1 Nov 2011 23:37:33 +0000 (16:37 -0700)

Update draft release notes to 1.7.8

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

Sync with 1.7.7.2Junio C Hamano Tue, 1 Nov 2011 23:20:42 +0000 (16:20 -0700)

Sync with 1.7.7.2

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

Git 1.7.7.2 v1.7.7.2Junio C Hamano Tue, 1 Nov 2011 23:16:36 +0000 (16:16 -0700)

Git 1.7.7.2

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

Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano Tue, 1 Nov 2011 23:41:41 +0000 (16:41 -0700)

Merge branch 'rs/maint-estimate-cache-size' into maint

* rs/maint-estimate-cache-size:
t7511: avoid use of reserved filename on Windows.

Merge branch 'md/smtp-tls-hello-again' into maintJunio C Hamano Tue, 1 Nov 2011 23:12:19 +0000 (16:12 -0700)

Merge branch 'md/smtp-tls-hello-again' into maint

* md/smtp-tls-hello-again:
send-email: Honour SMTP domain when using TLS

Merge branch 'jk/pull-rebase-with-work-tree' into maintJunio C Hamano Tue, 1 Nov 2011 23:11:00 +0000 (16:11 -0700)

Merge branch 'jk/pull-rebase-with-work-tree' into maint

* jk/pull-rebase-with-work-tree:
pull,rebase: handle GIT_WORK_TREE better

Conflicts:
git-pull.sh

Merge branch 'jc/maint-diffstat-numstat-context' into... Junio C Hamano Tue, 1 Nov 2011 23:10:56 +0000 (16:10 -0700)

Merge branch 'jc/maint-diffstat-numstat-context' into maint

* jc/maint-diffstat-numstat-context:
diff: teach --stat/--numstat to honor -U$num

Merge branch 'js/bisect-no-checkout' into maintJunio C Hamano Tue, 1 Nov 2011 23:03:35 +0000 (16:03 -0700)

Merge branch 'js/bisect-no-checkout' into maint

* js/bisect-no-checkout:
bisect: fix exiting when checkout failed in bisect_start()

Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano Tue, 1 Nov 2011 22:54:45 +0000 (15:54 -0700)

Merge branch 'bc/attr-ignore-case' into maint

* bc/attr-ignore-case:
attr.c: respect core.ignorecase when matching attribute patterns
attr: read core.attributesfile from git_default_core_config
builtin/mv.c: plug miniscule memory leak
cleanup: use internal memory allocation wrapper functions everywhere
attr.c: avoid inappropriate access to strbuf "buf" member

Conflicts:
remote.c

Merge branch 'cn/fetch-prune' into maintJunio C Hamano Tue, 1 Nov 2011 22:51:01 +0000 (15:51 -0700)

Merge branch 'cn/fetch-prune' into maint

* 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

Merge branch 'sp/smart-http-failure' into maintJunio C Hamano Tue, 1 Nov 2011 22:45:16 +0000 (15:45 -0700)

Merge branch 'sp/smart-http-failure' into maint

* sp/smart-http-failure:
remote-curl: Fix warning after HTTP failure

Merge jn/maint-http-error-messageJunio C Hamano Tue, 1 Nov 2011 22:42:25 +0000 (15:42 -0700)

Merge jn/maint-http-error-message

* commit 'be22d92eac809ad2bfa2b7c83ad7cad5a15f1c43':
http: avoid empty error messages for some curl errors
http: remove extra newline in error message

Merge branch 'jk/name-hash-dirent'Junio C Hamano Tue, 1 Nov 2011 22:31:12 +0000 (15:31 -0700)

Merge branch 'jk/name-hash-dirent'

* jk/name-hash-dirent:
name-hash.c: always initialize dir_next pointer

name-hash.c: always initialize dir_next pointerJohannes Sixt Tue, 1 Nov 2011 22:21:06 +0000 (23:21 +0100)

name-hash.c: always initialize dir_next pointer

Test t2021-checkout-overwrite.sh reveals a segfault in 'git add' on a
case-insensitive file system when git is compiled with XMALLOC_POISON
defined. The reason is that 2548183b (fix phantom untracked files when
core.ignorecase is set) added a new member dir_next to struct cache_entry,
but forgot to initialize it in all cases.

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

Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700)

Merge branch 'ss/blame-textconv-fake-working-tree'

* ss/blame-textconv-fake-working-tree:
(squash) test for previous
blame.c: Properly initialize strbuf after calling, textconv_object()

Conflicts:
t/t8006-blame-textconv.sh

Merge branch 'ef/mingw-upload-archive'Junio C Hamano Tue, 1 Nov 2011 22:20:22 +0000 (15:20 -0700)

Merge branch 'ef/mingw-upload-archive'

* ef/mingw-upload-archive:
mingw: poll.h is no longer in sys/
upload-archive: use start_command instead of fork
compat/win32/poll.c: upgrade from upstream
mingw: move poll out of sys-folder

Merge branch 'dm/pack-objects-update'Junio C Hamano Tue, 1 Nov 2011 22:20:07 +0000 (15:20 -0700)

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

Merge branch 'nd/pretty-commit-log-message'Junio C Hamano Tue, 1 Nov 2011 22:20:03 +0000 (15:20 -0700)

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

svn: Quote repository root in regex matchTed Percival Mon, 31 Oct 2011 22:37:12 +0000 (16:37 -0600)

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>

mingw: poll.h is no longer in sys/Erik Faye-Lund Tue, 1 Nov 2011 11:56:21 +0000 (12:56 +0100)

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>

MSVC: Remove unneeded header stubsVincent van Ravesteijn Mon, 31 Oct 2011 19:12:44 +0000 (20:12 +0100)

MSVC: Remove unneeded header stubs

These headers are no longer needed since they are no longer
unnecessarily included in git-compat-util.h.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Compile fix for MSVC: Include <io.h>Vincent van Ravesteijn Mon, 31 Oct 2011 19:12:43 +0000 (20:12 +0100)

Compile fix for MSVC: Include <io.h>

This include is needed for _commit(..) which is used in mingw.h.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Compile fix for MSVC: Do not include sys/resources.hVincent van Ravesteijn Mon, 31 Oct 2011 19:12:42 +0000 (20:12 +0100)

Compile fix for MSVC: Do not include sys/resources.h

Do not include header files when compiling with MSVC that do not
exist and which are also not included when compiling with MINGW.
A direct consequence is that git can be compiled again with MSVC
because the missing "sys/resources.h" is no longer included.

Instead of current

#ifndef mingw32 is the only one that is strange
... everything for systems that is not strange ...
#else
... include mingw specific tweaks ...
#endif
#ifdef msvc is also strange
... include msvc specific tweaks ...
#endif

it turns things around and says what it wants to achieve in a more direct
way, i.e.

#if mingw32
#include "compat/mingw.h"
#elif msvc
#include "compat/msvc.h"
#else
... all the others ...
#endif

which makes it a lot simpler.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Helped-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t7511: avoid use of reserved filename on Windows.Pat Thoyts Mon, 31 Oct 2011 14:07:27 +0000 (14:07 +0000)

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>

git-gui: fix spelling error in sshkey.tclDejan Ribič Sun, 30 Oct 2011 17:18:44 +0000 (18:18 +0100)

git-gui: fix spelling error in sshkey.tcl

Spelling error originally reported to Ubuntu as launchpad bug #879427.

Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Dejan Ribič <dejan.ribic@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

Git 1.7.8-rc0 v1.7.8-rc0Junio C Hamano Mon, 31 Oct 2011 02:14:24 +0000 (19:14 -0700)

Git 1.7.8-rc0

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

Merge branch 'jk/git-tricks'Junio C Hamano Mon, 31 Oct 2011 02:13:13 +0000 (19:13 -0700)

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

upload-archive: use start_command instead of forkErik Faye-Lund Mon, 24 Oct 2011 16:02:11 +0000 (18:02 +0200)

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 git-archive --remote
now works.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

compat/win32/poll.c: upgrade from upstreamErik Faye-Lund Mon, 24 Oct 2011 16:02:10 +0000 (18:02 +0200)

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.com>

mingw: move poll out of sys-folderErik Faye-Lund Mon, 24 Oct 2011 16:02:09 +0000 (18:02 +0200)

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>

(squash) test for previousJunio C Hamano Fri, 28 Oct 2011 16:36:55 +0000 (09:36 -0700)

(squash) test for previous

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

blame.c: Properly initialize strbuf after calling,... Sebastian Schuberth Fri, 28 Oct 2011 15:28:28 +0000 (17:28 +0200)

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
endings instead of Unix line endings which triggered the strbuf_setlen()
which previous to this patch failed.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>