gitweb.git
Merge branch 'ms/commit-cc-option-helpstring' into... Junio C Hamano Wed, 21 Dec 2011 18:50:20 +0000 (10:50 -0800)

Merge branch 'ms/commit-cc-option-helpstring' into maint

* ms/commit-cc-option-helpstring:
builtin/commit: add missing '/' in help message

builtin/commit: add missing '/' in help messageMichael Schubert Wed, 21 Dec 2011 14:56:00 +0000 (15:56 +0100)

builtin/commit: add missing '/' in help message

Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason Tue, 20 Dec 2011 23:27:41 +0000 (23:27 +0000)

builtin/init-db.c: eliminate -Wformat warning on Solaris

On Solaris systems we'd warn about an implicit cast of mode_t when we
printed things out with the %d format. We'd get this warning under GCC
4.6.0 with Solaris headers:

builtin/init-db.c: In function ‘separate_git_dir’:
builtin/init-db.c:354:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘mode_t’ [-Wformat]

We've been doing this ever since v1.7.4.1-296-gb57fb80. Just work
around this by adding an explicit cast.

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

Update draft release notes for 1.7.8.1Junio C Hamano Wed, 14 Dec 2011 06:08:52 +0000 (22:08 -0800)

Update draft release notes for 1.7.8.1

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

Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano Wed, 14 Dec 2011 06:04:50 +0000 (22:04 -0800)

Merge branch 'jc/maint-pack-object-cycle' into maint

* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects

Conflicts:
builtin/pack-objects.c

Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano Wed, 14 Dec 2011 06:03:36 +0000 (22:03 -0800)

Merge branch 'jc/index-pack-reject-dups' into maint

* jc/index-pack-reject-dups:
receive-pack, fetch-pack: reject bogus pack that records objects twice

Merge branch 'mf/curl-select-fdset' into maintJunio C Hamano Wed, 14 Dec 2011 06:03:17 +0000 (22:03 -0800)

Merge branch 'mf/curl-select-fdset' into maint

* mf/curl-select-fdset:
http: drop "local" member from request struct
http.c: Rely on select instead of tracking whether data was received
http.c: Use timeout suggested by curl instead of fixed 50ms timeout
http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping

Merge branch 'nd/misc-cleanups' into maintJunio C Hamano Wed, 14 Dec 2011 06:02:51 +0000 (22:02 -0800)

Merge branch 'nd/misc-cleanups' into maint

* nd/misc-cleanups:
unpack_object_header_buffer(): clear the size field upon error
tree_entry_interesting: make use of local pointer "item"
tree_entry_interesting(): give meaningful names to return values
read_directory_recursive: reduce one indentation level
get_tree_entry(): do not call find_tree_entry() on an empty tree
tree-walk.c: do not leak internal structure in tree_entry_len()

Merge branch 'maint-1.7.7' into maintJunio C Hamano Wed, 14 Dec 2011 05:58:51 +0000 (21:58 -0800)

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
Git 1.7.7.5
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
checkout,merge: loosen overwriting untracked file check based on info/exclude
cast variable in call to free() in builtin/diff.c and submodule.c
apply: get rid of useless x < 0 comparison on a size_t type

Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
builtin/fetch.c

Git 1.7.7.5 v1.7.7.5Junio C Hamano Wed, 14 Dec 2011 05:55:31 +0000 (21:55 -0800)

Git 1.7.7.5

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

Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano Wed, 14 Dec 2011 05:47:51 +0000 (21:47 -0800)

Merge branch 'ab/clang-lints' into maint-1.7.7

* ab/clang-lints:
cast variable in call to free() in builtin/diff.c and submodule.c
apply: get rid of useless x < 0 comparison on a size_t type

Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800)

Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7

* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude

Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano Wed, 14 Dec 2011 05:44:56 +0000 (21:44 -0800)

Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf

Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes

Git 1.7.6.5 v1.7.6.5Junio C Hamano Wed, 14 Dec 2011 05:30:40 +0000 (21:30 -0800)

Git 1.7.6.5

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

Merge branch 'jk/maint-fetch-status-table' into maint... Junio C Hamano Wed, 14 Dec 2011 05:21:30 +0000 (21:21 -0800)

Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6

* jk/maint-fetch-status-table:
fetch: create status table using strbuf

Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano Wed, 14 Dec 2011 05:12:34 +0000 (21:12 -0800)

Merge branch 'jc/maint-name-rev-all' into maint-1.7.6

* jc/maint-name-rev-all:
name-rev --all: do not even attempt to describe non-commit object

Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano Wed, 14 Dec 2011 05:12:14 +0000 (21:12 -0800)

Merge branch 'ml/mailmap' into maint-1.7.6

* ml/mailmap:
mailmap: xcalloc mailmap_info

Conflicts:
mailmap.c

blame: don't overflow time bufferJeff King Thu, 8 Dec 2011 10:25:54 +0000 (05:25 -0500)

blame: don't overflow time buffer

When showing the raw timestamp, we format the numeric
seconds-since-epoch into a buffer, followed by the timezone
string. This string has come straight from the commit
object. A well-formed object should have a timezone string
of only a few bytes, but we could be operating on data
pushed by a malicious user.

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

fetch: create status table using strbufJeff King Thu, 8 Dec 2011 08:43:19 +0000 (03:43 -0500)

fetch: create status table using strbuf

When we fetch from a remote, we print a status table like:

From url
* [new branch] foo -> origin/foo

We create this table in a static buffer using sprintf. If
the remote refnames are long, they can overflow this buffer
and smash the stack.

Instead, let's use a strbuf to build the string.

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

Merge branch 'maint-1.7.7' into maintJunio C Hamano Fri, 9 Dec 2011 21:33:39 +0000 (13:33 -0800)

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
am: don't persist keepcr flag
mingw: give waitpid the correct signature
git symbolic-ref: documentation fix

am: don't persist keepcr flagMartin von Zweigbergk Fri, 9 Dec 2011 07:30:45 +0000 (23:30 -0800)

am: don't persist keepcr flag

The keepcr flag is only used in the split_patches function, which is
only called before a patch application has to stopped for user input,
not after resuming. It is therefore unnecessary to persist the
flag. This seems to have been the case since it was introduced in
ad2c928 (git-am: Add command line parameter `--keep-cr` passing it to
git-mailsplit, 2010-02-27).

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

mingw: give waitpid the correct signatureErik Faye-Lund Thu, 8 Dec 2011 19:39:57 +0000 (20:39 +0100)

mingw: give waitpid the correct signature

POSIX says that last parameter to waitpid should be 'int',
so let's make it so.

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

git symbolic-ref: documentation fixMichael Haggerty Wed, 7 Dec 2011 15:20:16 +0000 (16:20 +0100)

git symbolic-ref: documentation fix

The old "git symbolic-ref" manpage seemed to imply in one place that
symlinks are still the default way to represent symbolic references
and in another that symlinks are deprecated. Fix the text and shorten
the justification for the change of implementation.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.7.7' into maintJunio C Hamano Mon, 5 Dec 2011 23:07:54 +0000 (15:07 -0800)

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
stripspace: fix outdated comment
Add MYMETA.yml to perl/.gitignore

Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano Mon, 5 Dec 2011 23:07:49 +0000 (15:07 -0800)

Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
stripspace: fix outdated comment
Add MYMETA.yml to perl/.gitignore

stripspace: fix outdated commentJeff King Mon, 5 Dec 2011 22:29:15 +0000 (17:29 -0500)

stripspace: fix outdated comment

The comment on top of stripspace() claims that the buffer
will no longer be NUL-terminated. However, this has not been
the case at least since the move to using strbuf in 2007.

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

Add MYMETA.yml to perl/.gitignoreSebastian Morr Fri, 2 Dec 2011 22:55:28 +0000 (23:55 +0100)

Add MYMETA.yml to perl/.gitignore

This file is auto-generated by newer versions of ExtUtils::MakeMaker
(presumably starting with the version shipping with Perl 5.14). It just
contains extra information about the environment and arguments to the
Makefile-building process, and should be ignored.

Signed-off-by: Sebastian Morr <sebastian@morr.cc>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'js/merge-edit-option'Junio C Hamano Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800)

Merge branch 'js/merge-edit-option'

* js/merge-edit-option:
Documentation: fix formatting error in merge-options.txt

Documentation: fix formatting error in merge-options.txtJack Nagel Mon, 5 Dec 2011 07:53:27 +0000 (01:53 -0600)

Documentation: fix formatting error in merge-options.txt

The first paragraph inside of a list item does not need a preceding line
consisting of a single '+', and in fact this causes the text to be
misrendered. Fix it.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.7.8 v1.7.8Junio C Hamano Fri, 2 Dec 2011 17:31:32 +0000 (09:31 -0800)

Git 1.7.8

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

Git 1.7.8-rc4 v1.7.8-rc4Junio C Hamano Mon, 28 Nov 2011 22:07:13 +0000 (14:07 -0800)

Git 1.7.8-rc4

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

checkout,merge: loosen overwriting untracked file check... Nguyễn Thái Ngọc Duy Sun, 27 Nov 2011 10:15:32 +0000 (17:15 +0700)

checkout,merge: loosen overwriting untracked file check based on info/exclude

Back in 1127148 (Loosen "working file will be lost" check in
Porcelain-ish - 2006-12-04), git-checkout.sh learned to quietly
overwrite ignored files. Howver the code only took .gitignore files
into account.

Standard ignored files include all specified in .gitignore files in
working directory _and_ $GIT_DIR/info/exclude. This patch makes sure
ignored files in info/exclude can also be overwritten automatically in
the spirit of the original patch.

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

builtin-reset: Documentation updateVincent van Ravesteijn Wed, 23 Nov 2011 06:44:16 +0000 (07:44 +0100)

builtin-reset: Documentation update

The second mode of 'git reset' is defined by the --patch
option, while the third mode is defined by the <mode> option.
Hence, these options are mandatory in the description of the
individual modes.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn Wed, 23 Nov 2011 06:31:55 +0000 (07:31 +0100)

builtin-branch: Fix crash on invalid use of --force

The option --force should not put us in 'create branch' mode. The
fact that this option is only valid in 'create branch' mode is
already caught by the the next 'if' in which we assure that we
are in the correct mode.

Without this patch, "git branch -f" without any other argument ends
up calling create_branch without any branch name.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

revert --abort: do not leave behind useless sequencer... Jonathan Nieder Wed, 23 Nov 2011 10:04:52 +0000 (04:04 -0600)

revert --abort: do not leave behind useless sequencer-old directory

The "git cherry-pick --abort" command currently renames the
.git/sequencer directory to .git/sequencer-old instead of removing it
on success due to an accident. cherry-pick --abort is designed to
work in three steps:

1) find which commit to roll back to
2) call "git reset --merge <commit>" to move to that commit
3) remove the .git/sequencer directory

But the careless author forgot step 3 entirely. The only reason the
command worked anyway is that "git reset --merge <commit>" renames the
.git/sequencer directory as a secondary effect --- after moving to
<commit>, or so the logic goes, it is unlikely but possible that the
caller of git reset wants to continue the series of cherry-picks that
was in progress, so git renames the sequencer state to
.git/sequencer-old to be helpful while allowing the cherry-pick to be
resumed if the caller did not want to end the sequence after all.

By running "git cherry-pick --abort", the operator has clearly
indicated that she is not planning to continue cherry-picking. Remove
the (renamed) .git/sequencer directory as intended all along.

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

Fix revert --abort on WindowsJohannes Sixt Wed, 23 Nov 2011 08:49:38 +0000 (09:49 +0100)

Fix revert --abort on Windows

On Windows, it is not possible to rename or remove a directory that has
open files. 'revert --abort' renamed .git/sequencer when it still had
.git/sequencer/head open. Close the file as early as possible to allow
the rename operation on Windows.

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

revert: do not pass non-literal string as format to... Nguyễn Thái Ngọc Duy Wed, 23 Nov 2011 12:45:36 +0000 (19:45 +0700)

revert: do not pass non-literal string as format to git_path()

This fixes the following warning.

CC builtin/revert.o
builtin/revert.c: In function ‘write_cherry_pick_head’:
builtin/revert.c:311: warning: format not a string literal and no format arguments

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

Update 1.7.8 draft release notes in preparation for rc4Junio C Hamano Wed, 23 Nov 2011 02:23:36 +0000 (18:23 -0800)

Update 1.7.8 draft release notes in preparation for rc4

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

Merge branch 'jn/revert-quit'Junio C Hamano Wed, 23 Nov 2011 02:22:08 +0000 (18:22 -0800)

Merge branch 'jn/revert-quit'

* jn/revert-quit:
revert: remove --reset compatibility option
revert: introduce --abort to cancel a failed cherry-pick
revert: write REVERT_HEAD pseudoref during conflicted revert
revert: improve error message for cherry-pick during cherry-pick
revert: rearrange pick_revisions() for clarity
revert: rename --reset option to --quit

revert: remove --reset compatibility optionJonathan Nieder Tue, 22 Nov 2011 11:20:46 +0000 (05:20 -0600)

revert: remove --reset compatibility option

Remove the "git cherry-pick --reset" option, which has a different
preferred spelling nowadays ("--quit"). Luckily the old --reset name
was not around long enough for anyone to get used to it.

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

revert: introduce --abort to cancel a failed cherry... Jonathan Nieder Wed, 23 Nov 2011 01:27:21 +0000 (19:27 -0600)

revert: introduce --abort to cancel a failed cherry-pick

After running some ill-advised command like "git cherry-pick
HEAD..linux-next", the bewildered novice may want to return to more
familiar territory. Introduce a "git cherry-pick --abort" command
that rolls back the entire cherry-pick sequence and places the
repository back on solid ground.

Just like "git merge --abort", this internally uses "git reset
--merge", so local changes not involved in the conflict resolution are
preserved.

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

revert: write REVERT_HEAD pseudoref during conflicted... Jonathan Nieder Tue, 22 Nov 2011 11:17:36 +0000 (05:17 -0600)

revert: write REVERT_HEAD pseudoref during conflicted revert

When conflicts are encountered while reverting a commit, it can be
handy to have the name of that commit easily available. For example,
to produce a copy of the patch to refer to while resolving conflicts:

$ git revert 2eceb2a8
error: could not revert 2eceb2a8... awesome, buggy feature
$ git show -R REVERT_HEAD >the-patch
$ edit $(git diff --name-only)

Set a REVERT_HEAD pseudoref when "git revert" does not make a commit,
for cases like this. This also makes it possible for scripts to
distinguish between a revert that encountered conflicts and other
sources of an unmerged index.

After successfully committing, resetting with "git reset", or moving
to another commit with "git checkout" or "git reset", the pseudoref is
no longer useful, so remove it.

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

revert: improve error message for cherry-pick during... Jonathan Nieder Tue, 22 Nov 2011 11:15:47 +0000 (05:15 -0600)

revert: improve error message for cherry-pick during cherry-pick

In the spirit of v1.6.3.3~3^2 (refuse to merge during a merge,
2009-07-01), "git cherry-pick" refuses to start a new cherry-pick when
in the middle of an existing conflicted cherry-pick in the following
sequence:

1. git cherry-pick HEAD..origin
2. resolve conflicts
3. git cherry-pick HEAD..origin (instead of "git cherry-pick
--continue", by mistake)

Good. However, the error message on attempting step 3 is more
convoluted than necessary:

$ git cherry-pick HEAD..origin
error: .git/sequencer already exists.
error: A cherry-pick or revert is in progress.
hint: Use --continue to continue the operation
hint: or --quit to forget about it
fatal: cherry-pick failed

Clarify by removing the redundant first "error:" message, simplifying
the advice, and using lower-case and no full stops to be consistent
with other commands that prefix their messages with "error:", so it
becomes

error: a cherry-pick or revert is already in progress
hint: try "git cherry-pick (--continue | --quit)"
fatal: cherry-pick failed

The "fatal: cherry-pick failed" line seems unnecessary, too, but
that can be fixed some other day.

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

revert: rearrange pick_revisions() for clarityJonathan Nieder Tue, 22 Nov 2011 11:15:10 +0000 (05:15 -0600)

revert: rearrange pick_revisions() for clarity

Deal completely with "cherry-pick --quit" and --continue at the
beginning of pick_revisions(), leaving the rest of the function for
the more interesting "git cherry-pick <commits>" case.

No functional change intended. The impact is just to unindent the
code a little.

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

revert: rename --reset option to --quitJonathan Nieder Tue, 22 Nov 2011 11:14:29 +0000 (05:14 -0600)

revert: rename --reset option to --quit

The option to "git cherry-pick" and "git revert" to discard the
sequencer state introduced by v1.7.8-rc0~141^2~6 (revert: Introduce
--reset to remove sequencer state, 2011-08-04) has a confusing name.
Change it now, while we still have the time.

The new name for "cherry-pick, please get out of my way, since I've
long forgotten about the sequence of commits I was cherry-picking when
you wrote that old .git/sequencer directory" is --quit. Mnemonic:
this is analagous to quiting a program the user is no longer using ---
we just want to get out of the multiple-command cherry-pick procedure
and not to reset HEAD or rewind any other old state.

The "--reset" option is kept as a synonym to minimize the impact. We
might consider dropping it for simplicity in a separate patch, though.

Adjust documentation and tests to use the newly preferred name (--quit)
instead of --reset. While at it, let's clarify the short descriptions
of these operations in "-h" output.

Before:

--reset forget the current operation
--continue continue the current operation

After:

--quit end revert or cherry-pick sequence
--continue resume revert or cherry-pick sequence

Noticed-by: Phil Hord <phil.hord@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 Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800)

Merge branch 'maint'

* maint:
documentation fix: git difftool uses diff tools, not merge tools.

Merge branch 'rr/misc-fixes'Junio C Hamano Mon, 21 Nov 2011 19:03:20 +0000 (11:03 -0800)

Merge branch 'rr/misc-fixes'

* rr/misc-fixes:
convert.c: Fix return type of git_path_check_eol()

convert.c: Fix return type of git_path_check_eol()Ramsay Jones Mon, 21 Nov 2011 18:42:09 +0000 (18:42 +0000)

convert.c: Fix return type of git_path_check_eol()

The git_path_check_eol() function converts a string value to the
corresponding 'enum eol' value. However, the function is currently
declared to return an 'enum crlf_action', which causes sparse to
complain thus:

SP convert.c
convert.c:736:50: warning: mixing different enum types
convert.c:736:50: int enum crlf_action versus
convert.c:736:50: int enum eol

In order to suppress the warning, we simply correct the return type
in the function declaration.

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

documentation fix: git difftool uses diff tools, not... Thomas Hochstein Mon, 14 Nov 2011 22:55:52 +0000 (23:55 +0100)

documentation fix: git difftool uses diff tools, not merge tools.

Let the documentation for -t list valid *diff* tools,
not valid *merge* tools.

Signed-off-by: Thomas Hochstein <thh@inter.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

config.c: Fix a static buffer overwrite bug by avoiding... Ramsay Jones Sat, 19 Nov 2011 19:42:00 +0000 (19:42 +0000)

config.c: Fix a static buffer overwrite bug by avoiding mkpath()

On cygwin, test number 21 of t3200-branch.sh (git branch -m q q2
without config should succeed) fails. The failure involves the
functions from path.c which parcel out internal static buffers
from the git_path() and mkpath() functions.

In particular, the rename_ref() function calls safe_create_leading\
_directories() with a filename returned by git_path("logs/%s", ref).
safe_create_leading_directories(), in turn, calls stat() on each
element of the path it is given. On cygwin, this leads to a call
to git_config() for each component of the path, since this test
explicitly removes the config file. git_config() calls mkpath(), so
on the fourth component of the path, the original buffer passed
into the function is overwritten with the config filename.

Note that this bug is specific to cygwin and it's schizophrenic
stat() functions (see commits adbc0b6, 7faee6b and 7974843). The
lack of a config file and a path with at least four elements is
also important to trigger the bug.

In order to fix the problem, we replace the call to mkpath() with
a call to mksnpath() and provide our own buffer.

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

t5501-*.sh: Fix url passed to clone in setup testRamsay Jones Sat, 19 Nov 2011 19:38:54 +0000 (19:38 +0000)

t5501-*.sh: Fix url passed to clone in setup test

In particular, the url passed to git-clone has an extra '/' given
after the 'file://' schema prefix, thus:

git clone --reference=original "file:///$(pwd)/original one

Once the prefix is removed, the remainder of the url looks something
like "//home/ramsay/git/t/...", which is then interpreted as an
network path. This then results in a "Permission denied" error, like
so:

ramsay $ ls //home
ls: cannot access //home: No such host or network path
ramsay $ ls //home/ramsay
ls: cannot access //home/ramsay: Permission denied
ramsay $

In order to fix the problem, we simply remove the extraneous '/'
character from the url.

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

Hopefully final update of release notes before 1.7... Junio C Hamano Fri, 18 Nov 2011 22:19:45 +0000 (14:19 -0800)

Hopefully final update of release notes before 1.7.8 final

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

Merge branch 'rr/misc-fixes'Junio C Hamano Fri, 18 Nov 2011 22:13:48 +0000 (14:13 -0800)

Merge branch 'rr/misc-fixes'

* rr/misc-fixes:
git-compat-util: don't assume value for undefined variable
sha1_file: don't mix enum with int
convert: don't mix enum with int
http: remove unused function hex()

Makefile: add option to disable automatic dependency... Jonathan Nieder Fri, 18 Nov 2011 09:58:21 +0000 (03:58 -0600)

Makefile: add option to disable automatic dependency generation

Now that the COMPUTE_HEADER_DEPENDENCIES feature is turned on
automatically for compilers that support it (see v1.7.8-rc0~142^2~1,
2011-08-18), there is no easy way to force it off. For example,
setting COMPUTE_HEADER_DEPENDENCIES to the empty string in config.mak
just tells the makefile to treat it as undefined and run a test
command to see if the -MMD option is supported.

So allow setting COMPUTE_HEADER_DEPENDENCIES=no to explicitly force
the feature off. The new semantics:

- "yes" means to explicitly enable the feature
- "no" means to disable it
- "auto" means to autodetect

The default is still "auto". Any value other than these three will
cause the build to error out with a descriptive message so typos and
stale settings in config.mak don't result in mysterious behavior.

Makefile:1278: *** please set COMPUTE_HEADER_DEPENDENCIES to
yes, no, or auto (not "1"). Stop.

So now when someone using a compiler without -MMD support reports
trouble building git, you can reproduce it by running "make
COMPUTE_HEADER_DEPENDENCIES=no".

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

Sync with 1.7.7.4Junio C Hamano Fri, 18 Nov 2011 19:30:02 +0000 (11:30 -0800)

Sync with 1.7.7.4

Git 1.7.7.4 v1.7.7.4Junio C Hamano Fri, 18 Nov 2011 19:28:05 +0000 (11:28 -0800)

Git 1.7.7.4

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

Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano Fri, 18 Nov 2011 19:14:16 +0000 (11:14 -0800)

Merge branch 'jc/maint-name-rev-all' into maint

* jc/maint-name-rev-all:
name-rev --all: do not even attempt to describe non-commit object

Merge branch 'ml/mailmap' into maintJunio C Hamano Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800)

Merge branch 'ml/mailmap' into maint

* ml/mailmap:
mailmap: xcalloc mailmap_info

Conflicts:
mailmap.c

Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano Fri, 18 Nov 2011 19:11:50 +0000 (11:11 -0800)

Merge branch 'jn/maint-notes-avoid-va-args' into maint

* jn/maint-notes-avoid-va-args:
notes merge: eliminate OUTPUT macro

Conflicts:
notes-merge.c

Makefile: add missing header file dependenciesJonathan Nieder Fri, 18 Nov 2011 10:02:02 +0000 (04:02 -0600)

Makefile: add missing header file dependencies

When the streaming filter API was introduced in v1.7.7-rc0~60^2~7
(2011-05-20), we forgot to add its header to LIB_H. Most translation
units depend on streaming.h via cache.h.

v1.7.5-rc0~48 (Fix sparse warnings, 2011-03-22) introduced undeclared
dependencies by url.o on url.h and thread-utils.o on thread-utils.h.

Noticed by make CHECK_HEADER_DEPENDENCIES=1.

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

notes merge: eliminate OUTPUT macroJonathan Nieder Fri, 18 Nov 2011 01:27:46 +0000 (19:27 -0600)

notes merge: eliminate OUTPUT macro

The macro is variadic, which breaks support for pre-C99 compilers,
and it hides an "if", which can make code hard to understand on
first reading if some arguments have side-effects.

The OUTPUT macro seems to have been inspired by the "output" function
from merge-recursive. But that function in merge-recursive exists to
indent output based on the level of recursion and there is no similar
justification for such a function in "notes merge".

Noticed with 'make CC="gcc -std=c89 -pedantic"':

notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros]

Encouraged-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

do not let git_path clobber errno when reporting errorsJonathan Nieder Wed, 16 Nov 2011 08:03:36 +0000 (02:03 -0600)

do not let git_path clobber errno when reporting errors

Because git_path() calls vsnprintf(), code like

fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666);
die_errno(_("Could not write to '%s'"), git_path("SQUASH_MSG"));

can end up printing an error indicator from vsnprintf() instead of
open() by mistake. Store the path we are trying to write to in a
temporary variable and pass _that_ to die_errno(), so the messages
written by git cherry-pick/revert and git merge can avoid this source
of confusion.

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

Git 1.7.8-rc3 v1.7.8-rc3Junio C Hamano Thu, 17 Nov 2011 19:06:15 +0000 (11:06 -0800)

Git 1.7.8-rc3

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

pack-object: tolerate broken packs that have duplicated... Junio C Hamano Thu, 17 Nov 2011 06:04:03 +0000 (22:04 -0800)

pack-object: tolerate broken packs that have duplicated objects

When --reuse-delta is in effect (which is the default), and an existing
pack in the repository has the same object registered twice (e.g. one copy
in a non-delta format and the other copy in a delta against some other
object), an attempt to repack the repository can result in a cyclic delta
dependency, causing write_one() function to infinitely recurse into
itself.

Detect such a case and break the loopy dependency by writing out an object
that is involved in such a loop in the non-delta format.

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

receive-pack, fetch-pack: reject bogus pack that record... Junio C Hamano Thu, 17 Nov 2011 06:04:13 +0000 (22:04 -0800)

receive-pack, fetch-pack: reject bogus pack that records objects twice

When receive-pack & fetch-pack are run and store the pack obtained over
the wire to a local repository, they internally run the index-pack command
with the --strict option. Make sure that we reject incoming packfile that
records objects twice to avoid spreading such a damage.

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

refs: loosen over-strict "format" checkJunio C Hamano Thu, 17 Nov 2011 00:54:32 +0000 (16:54 -0800)

refs: loosen over-strict "format" check

The add_extra_ref() interface is used to add an extra-ref that is _not_
our ref for the purpose of helping auto-following of tags and reducing
object transfer from remote repository, and they are typically formatted
as a tagname followed by ^{} to make sure no valid refs match that
pattern. In other words, these entries are deliberately formatted not to
pass check-refname-format test.

A recent series however added a test unconditionally to the add_ref()
function that is called from add_extra_ref(). The check may be sensible
for other two callsites of the add_ref() interface, but definitely is
a wrong thing to do in add_extra_ref(). Disable it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Michael Haggerty <mhagger@alum.mit.edu>

mailmap: xcalloc mailmap_infoMarc-André Lureau Thu, 17 Nov 2011 01:25:06 +0000 (02:25 +0100)

mailmap: xcalloc mailmap_info

This is to avoid reaching free of uninitialized members.

With an invalid .mailmap (and perhaps in other cases), it can reach
free(mi->name) with garbage for example.

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

revert: prettify fatal messagesRamkumar Ramachandra Tue, 15 Nov 2011 09:31:32 +0000 (15:01 +0530)

revert: prettify fatal messages

Some of the fatal messages printed by revert and cherry-pick look ugly
like the following:

fatal: Could not open .git/sequencer/todo.: No such file or directory

The culprit here is that these callers of the die_errno() function did not
take it into account that the message string they give to it is followed
by ": <strerror>", hence the message typically should not end with the
full-stop.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-compat-util: don't assume value for undefined variableRamkumar Ramachandra Tue, 15 Nov 2011 17:31:09 +0000 (23:01 +0530)

git-compat-util: don't assume value for undefined variable

Suggested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

sha1_file: don't mix enum with intRamkumar Ramachandra Tue, 15 Nov 2011 16:59:39 +0000 (22:29 +0530)

sha1_file: don't mix enum with int

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

convert: don't mix enum with intRamkumar Ramachandra Tue, 15 Nov 2011 16:59:37 +0000 (22:29 +0530)

convert: don't mix enum with int

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http: remove unused function hex()Ramkumar Ramachandra Tue, 15 Nov 2011 16:59:36 +0000 (22:29 +0530)

http: remove unused function hex()

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

name-rev --all: do not even attempt to describe non... Junio C Hamano Tue, 15 Nov 2011 23:51:05 +0000 (15:51 -0800)

name-rev --all: do not even attempt to describe non-commit object

This even dates back to the very beginning of "git name-rev";
it does not make much sense to dump all objects in the repository
and label non-commits as "undefined".

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

Revert "upload-archive: use start_command instead of... Junio C Hamano Tue, 15 Nov 2011 23:39:33 +0000 (15:39 -0800)

Revert "upload-archive: use start_command instead of fork"

This reverts commit c09cd77ea2fe3580b33918a99fe138d239ac2aaf, expecting a
better version to be rerolled soon.

Git 1.7.8-rc2 v1.7.8-rc2Junio C Hamano Sun, 13 Nov 2011 06:14:53 +0000 (22:14 -0800)

Git 1.7.8-rc2

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

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>

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>

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>

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>

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>

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>