gitweb.git
rename_tmp_log(): on SCLD_VANISHED, retryMichael Haggerty Sat, 18 Jan 2014 22:49:01 +0000 (23:49 +0100)

rename_tmp_log(): on SCLD_VANISHED, retry

If safe_create_leading_directories() fails because a file along the
path unexpectedly vanished, try again from the beginning. Try at most
4 times.

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

rename_tmp_log(): limit the number of remote_empty_dire... Michael Haggerty Sat, 18 Jan 2014 22:49:00 +0000 (23:49 +0100)

rename_tmp_log(): limit the number of remote_empty_directories() attempts

This doesn't seem to be a likely error, but we've got the counter
anyway, so we might as well use it for an added bit of safety.

Please note that the first call to rename() is optimistic, and it is
normal for it to fail if there is a directory in the way. So bump the
total number of allowed attempts to 4, to be sure that we can still
have at least 3 retries in the case of a race.

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

rename_tmp_log(): handle a possible mkdir/rmdir raceMichael Haggerty Sat, 18 Jan 2014 22:48:59 +0000 (23:48 +0100)

rename_tmp_log(): handle a possible mkdir/rmdir race

If a directory vanishes while renaming the temporary reflog file,
retry (up to 3 times). This could happen if another process deletes
the directory created by safe_create_leading_directories() just before
we rename the file into the directory.

As far as I can tell, this race could not occur internal to git. The
only time that a directory under $GIT_DIR/logs is deleted is if room
has to be made for a log file for a reference with the same name;
for example, in the following sequence:

git branch foo/bar # Creates file .git/logs/refs/heads/foo/bar
git branch -d foo/bar # Deletes file but leaves .git/logs/refs/heads/foo/
git branch foo # Deletes .git/logs/refs/heads/foo/

But the only reason the last command deletes the directory is because
it wants to create a file with the same name. So if another process
(e.g.,

git branch foo/baz

) wants to create that directory, one of the two is doomed to failure
anyway because of a D/F conflict.

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

rename_ref(): extract function rename_tmp_log()Michael Haggerty Sat, 18 Jan 2014 22:48:58 +0000 (23:48 +0100)

rename_ref(): extract function rename_tmp_log()

It's about to become a bit more complex.

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

remove_dir_recurse(): handle disappearing files and... Michael Haggerty Sat, 18 Jan 2014 22:48:57 +0000 (23:48 +0100)

remove_dir_recurse(): handle disappearing files and directories

If a file or directory that we are trying to remove disappears (e.g.,
because another process has pruned it), do not consider it an error.

However, if REMOVE_DIR_KEEP_TOPLEVEL is set, and the toplevel
directory is missing, then consider it an error (like before).

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

remove_dir_recurse(): tighten condition for removing... Michael Haggerty Sat, 18 Jan 2014 22:48:56 +0000 (23:48 +0100)

remove_dir_recurse(): tighten condition for removing unreadable dir

If opendir() fails on the top-level directory, it makes sense to try
to delete it anyway--but only if the failure was due to EACCES.

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

lock_ref_sha1_basic(): if locking fails with ENOENT... Michael Haggerty Sat, 18 Jan 2014 22:48:55 +0000 (23:48 +0100)

lock_ref_sha1_basic(): if locking fails with ENOENT, retry

If hold_lock_file_for_update() fails with errno==ENOENT, it might be
because somebody else (for example, a pack-refs process) has just
deleted one of the lockfile's ancestor directories. So if this
condition is detected, try again (up to 3 times).

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

lock_ref_sha1_basic(): on SCLD_VANISHED, retryMichael Haggerty Sat, 18 Jan 2014 22:48:54 +0000 (23:48 +0100)

lock_ref_sha1_basic(): on SCLD_VANISHED, retry

If safe_create_leading_directories() fails because a file along the
path unexpectedly vanished, try again (up to 3 times).

This can occur if another process is deleting directories at the same
time as we are trying to make them. For example, "git pack-refs
--all" tries to delete the loose refs and any empty directories that
are left behind. If a pack-refs process is running, then it might
delete a directory that we need to put a new loose reference in.

If safe_create_leading_directories() thinks this might have happened,
then take its advice and try again (maximum three attempts).

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

safe_create_leading_directories(): add new error value... Michael Haggerty Mon, 6 Jan 2014 13:45:27 +0000 (14:45 +0100)

safe_create_leading_directories(): add new error value SCLD_VANISHED

Add a new possible error result that can be returned by
safe_create_leading_directories() and
safe_create_leading_directories_const(): SCLD_VANISHED. This value
indicates that a file or directory on the path existed at one point
(either it already existed or the function created it), but then it
disappeared. This probably indicates that another process deleted the
directory while we were working. If SCLD_VANISHED is returned, the
caller might want to retry the function call, as there is a chance
that a new attempt will succeed.

Why doesn't safe_create_leading_directories() do the retrying
internally? Because an empty directory isn't really ever safe until
it holds a file. So even if safe_create_leading_directories() were
absolutely sure that the directory existed before it returned, there
would be no guarantee that the directory still existed when the caller
tried to write something in it.

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

cmd_init_db(): when creating directories, handle errors... Michael Haggerty Mon, 6 Jan 2014 13:45:26 +0000 (14:45 +0100)

cmd_init_db(): when creating directories, handle errors conservatively

safe_create_leading_directories_const() returns a non-zero value on
error. The old code at this calling site recognized a couple of
particular error values, and treated all other return values as
success. Instead, be more conservative: recognize the errors we are
interested in, but treat any other nonzero values as failures. This
is more robust in case somebody adds another possible return value
without telling us.

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

safe_create_leading_directories(): introduce enum for... Michael Haggerty Mon, 6 Jan 2014 13:45:25 +0000 (14:45 +0100)

safe_create_leading_directories(): introduce enum for return values

Instead of returning magic integer values (which a couple of callers
go to the trouble of distinguishing), return values from an enum. Add
a docstring.

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

safe_create_leading_directories(): always restore slash... Michael Haggerty Mon, 6 Jan 2014 13:45:24 +0000 (14:45 +0100)

safe_create_leading_directories(): always restore slash at end of loop

Always restore the slash that we scribbled over at the end of the
loop, rather than also fixing it up at each premature exit from the
loop. This makes it harder to forget to do the cleanup as new paths
are added to the code.

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

safe_create_leading_directories(): split on first of... Michael Haggerty Mon, 6 Jan 2014 13:45:23 +0000 (14:45 +0100)

safe_create_leading_directories(): split on first of multiple slashes

If the input path has multiple slashes between path components (e.g.,
"foo//bar"), then the old code was breaking the path at the last
slash, not the first one. So in the above example, the second slash
was overwritten with NUL, resulting in the parent directory being
sought as "foo/".

When stat() is called on "foo/", it fails with ENOTDIR if "foo" exists
but is not a directory. This caused the wrong path to be taken in the
subsequent logic.

So instead, split path components at the first intercomponent slash
rather than the last one.

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

safe_create_leading_directories(): rename local variableMichael Haggerty Mon, 6 Jan 2014 13:45:22 +0000 (14:45 +0100)

safe_create_leading_directories(): rename local variable

Rename "pos" to "next_component", because now it always points at the
next component of the path name that has to be processed.

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

safe_create_leading_directories(): add explicit "slash... Michael Haggerty Mon, 6 Jan 2014 13:45:21 +0000 (14:45 +0100)

safe_create_leading_directories(): add explicit "slash" pointer

Keep track of the position of the slash character independently of
"pos", thereby making the purpose of each variable clearer and
working towards other upcoming changes.

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

safe_create_leading_directories(): reduce scope of... Michael Haggerty Mon, 6 Jan 2014 13:45:20 +0000 (14:45 +0100)

safe_create_leading_directories(): reduce scope of local variable

This makes it more obvious that values of "st" don't persist across
loop iterations.

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

safe_create_leading_directories(): fix format of "if... Michael Haggerty Mon, 6 Jan 2014 13:45:19 +0000 (14:45 +0100)

safe_create_leading_directories(): fix format of "if" chaining

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

Git 1.8.5.2 v1.8.5.2Junio C Hamano Tue, 17 Dec 2013 19:42:12 +0000 (11:42 -0800)

Git 1.8.5.2

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

Merge branch 'rs/doc-submitting-patches' into maintJunio C Hamano Tue, 17 Dec 2013 19:38:23 +0000 (11:38 -0800)

Merge branch 'rs/doc-submitting-patches' into maint

* rs/doc-submitting-patches:
SubmittingPatches: document how to handle multiple patches

Merge branch 'tr/doc-git-cherry' into maintJunio C Hamano Tue, 17 Dec 2013 19:37:55 +0000 (11:37 -0800)

Merge branch 'tr/doc-git-cherry' into maint

* tr/doc-git-cherry:
Documentation: revamp git-cherry(1)

Merge branch 'nd/glossary-content-pathspec-markup'... Junio C Hamano Tue, 17 Dec 2013 19:36:54 +0000 (11:36 -0800)

Merge branch 'nd/glossary-content-pathspec-markup' into maint

* nd/glossary-content-pathspec-markup:
glossary-content.txt: fix documentation of "**" patterns

Merge branch 'jj/doc-markup-gitcli' into maintJunio C Hamano Tue, 17 Dec 2013 19:36:38 +0000 (11:36 -0800)

Merge branch 'jj/doc-markup-gitcli' into maint

* jj/doc-markup-gitcli:
Documentation/gitcli.txt: fix double quotes

Merge branch 'jj/doc-markup-hints-in-coding-guidelines... Junio C Hamano Tue, 17 Dec 2013 19:36:10 +0000 (11:36 -0800)

Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint

* jj/doc-markup-hints-in-coding-guidelines:
State correct usage of literal examples in man pages in the coding standards

Merge branch 'jj/log-doc' into maintJunio C Hamano Tue, 17 Dec 2013 19:35:41 +0000 (11:35 -0800)

Merge branch 'jj/log-doc' into maint

* jj/log-doc:
Documentation/git-log.txt: mark-up fix and minor rephasing
Documentation/git-log: update "--log-size" description

Merge branch 'jj/rev-list-options-doc' into maintJunio C Hamano Tue, 17 Dec 2013 19:34:41 +0000 (11:34 -0800)

Merge branch 'jj/rev-list-options-doc' into maint

* jj/rev-list-options-doc:
Documentation/rev-list-options.txt: fix some grammatical issues and typos
Documentation/rev-list-options.txt: fix mark-up

Merge branch 'tb/doc-fetch-pack-url' into maintJunio C Hamano Tue, 17 Dec 2013 19:34:24 +0000 (11:34 -0800)

Merge branch 'tb/doc-fetch-pack-url' into maint

* tb/doc-fetch-pack-url:
git-fetch-pack uses URLs like git-fetch

Merge branch 'mi/typofixes' into maintJunio C Hamano Tue, 17 Dec 2013 19:34:01 +0000 (11:34 -0800)

Merge branch 'mi/typofixes' into maint

* mi/typofixes:
contrib: typofixes
Documentation/technical/http-protocol.txt: typofixes
typofixes: fix misspelt comments

Merge branch 'jh/loose-object-dirs-creation-race' into... Junio C Hamano Tue, 17 Dec 2013 19:32:50 +0000 (11:32 -0800)

Merge branch 'jh/loose-object-dirs-creation-race' into maint

Two processes creating loose objects at the same time could have
failed unnecessarily when the name of their new objects started
with the same byte value, due to a race condition.

* jh/loose-object-dirs-creation-race:
sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

Merge branch 'jk/two-way-merge-corner-case-fix' into... Junio C Hamano Tue, 17 Dec 2013 19:32:04 +0000 (11:32 -0800)

Merge branch 'jk/two-way-merge-corner-case-fix' into maint

"git am --abort" sometimes complained about not being able to write
a tree with an 0{40} object in it.

* jk/two-way-merge-corner-case-fix:
t1005: add test for "read-tree --reset -u A B"
t1005: reindent
unpack-trees: fix "read-tree -u --reset A B" with conflicted index

Merge branch 'sb/sha1-loose-object-info-check-existence... Junio C Hamano Tue, 17 Dec 2013 19:31:18 +0000 (11:31 -0800)

Merge branch 'sb/sha1-loose-object-info-check-existence' into maint

"git cat-file --batch-check=ok" did not check the existence of the
named object.

* sb/sha1-loose-object-info-check-existence:
sha1_loose_object_info(): do not return success on missing object

Merge branch 'nd/magic-pathspec' into maintJunio C Hamano Tue, 17 Dec 2013 19:21:34 +0000 (11:21 -0800)

Merge branch 'nd/magic-pathspec' into maint

"git diff -- ':(icase)makefile'" was unnecessarily rejected at the
command line parser.

* nd/magic-pathspec:
diff: restrict pathspec limitations to diff b/f case only

cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty Tue, 17 Dec 2013 13:43:58 +0000 (14:43 +0100)

cmd_repack(): remove redundant local variable "nr_packs"

Its value is the same as the number of entries in the "names"
string_list, so just use "names.nr" in its place.

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

Git 1.8.5.1 v1.8.5.1Junio C Hamano Tue, 3 Dec 2013 19:16:56 +0000 (11:16 -0800)

Git 1.8.5.1

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

ref-iteration doc: add_submodule_odb() returns 0 for... Nick Townsend Mon, 25 Nov 2013 23:31:09 +0000 (15:31 -0800)

ref-iteration doc: add_submodule_odb() returns 0 for success

The usage sample of add_submodule_odb() function in the Submodules
section expects non-zero return value for success, but the function
actually reports success with zero.

Helped-by: René Scharfe <l.s.r@web.de>
Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Nick Townsend <nick.townsend@mac.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.8.4.5Junio C Hamano Mon, 2 Dec 2013 23:34:44 +0000 (15:34 -0800)

Sync with 1.8.4.5

Git 1.8.4.5 v1.8.4.5Junio C Hamano Mon, 2 Dec 2013 23:33:30 +0000 (15:33 -0800)

Git 1.8.4.5

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

submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano Mon, 2 Dec 2013 21:31:55 +0000 (13:31 -0800)

submodule: do not copy unknown update mode from .gitmodules

When submodule.$name.update is given as hint from the upstream in
the .gitmodules file, we used to blindly copy it to .git/config,
unless there already is a value defined for the submodule.

However, there is no reason to expect that the update mode hinted by
the upstream is available in the version of Git the user is using,
and a really custom "!cmd" prepared by an upstream person running on
Linux may not even be available to a user on Windows. It is simply
irresponsible to copy the setting blindly and to attempt to use it
during a later "submodule update" without validating it first.

Just show the suggested value to the diagnostic output, and set the
value to 'none' in the configuration, if it is not one of the ones
that are known to be supported by this version of Git.

Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: revamp git-cherry(1)Thomas Rast Fri, 22 Nov 2013 16:29:16 +0000 (17:29 +0100)

Documentation: revamp git-cherry(1)

git-cherry(1)'s "description" section has never really managed
to explain to me what the command does. It contains too much
explanation of the algorithm instead of simply saying what
goals it achieves, and too much terminology that we otherwise
do not use (fork-point instead of merge-base).

Try a much more concise approach: state what it finds out, why
this is neat, and how the output is formatted, in a few short
paragraphs. In return, provide much longer examples of how it
fits into a "format-patch | am" based workflow, and how it
compares to reading the same from git-log.

Also carefully avoid using "merge" in a context where it does
not mean something that comes from git-merge(1). Instead, say
"apply" in an attempt to further link to patch workflow
concepts.

While there, also omit the language about _which_ upstream
branch we treat as the default. I literally just learned that
we support having several, so let's not confuse new users
here, especially considering that git-config(1) does not
document this.

Prompted-by: a.huemer@commend.com on #git
Signed-off-by: Thomas Rast <tr@thomasrast.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.5 v1.8.5Junio C Hamano Wed, 27 Nov 2013 20:14:45 +0000 (12:14 -0800)

Git 1.8.5

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

Sync with maintJunio C Hamano Wed, 27 Nov 2013 20:13:29 +0000 (12:13 -0800)

Sync with maint

* maint:
remote-hg: don't decode UTF-8 paths into Unicode objects

remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)

remote-hg: don't decode UTF-8 paths into Unicode objects

The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again.

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

SubmittingPatches: document how to handle multiple... René Scharfe Wed, 27 Nov 2013 00:28:39 +0000 (01:28 +0100)

SubmittingPatches: document how to handle multiple patches

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'rh/remote-hg-bzr-updates' (early part)Junio C Hamano Mon, 25 Nov 2013 16:20:02 +0000 (08:20 -0800)

Merge branch 'rh/remote-hg-bzr-updates' (early part)

Unbreaks a recent breakage due to use of unquote-c-style.

This may need to be cherry-picked down to 1.8.4.x series.

* 'rh/remote-hg-bzr-updates' (early part):
remote-hg: don't decode UTF-8 paths into Unicode objects

glossary-content.txt: fix documentation of "**" patternsNguyễn Thái Ngọc Duy Thu, 21 Nov 2013 06:44:20 +0000 (13:44 +0700)

glossary-content.txt: fix documentation of "**" patterns

"**" means bold in ASCIIDOC, so we need to escape it. This is similar
to 8447dc8 (gitignore.txt: fix documentation of "**" patterns -
2013-11-07)

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

Documentation/gitcli.txt: fix double quotesJason St. John Wed, 20 Nov 2013 01:34:40 +0000 (20:34 -0500)

Documentation/gitcli.txt: fix double quotes

Replace double quotes around literal examples with backticks

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff: restrict pathspec limitations to diff b/f case... Nguyễn Thái Ngọc Duy Wed, 20 Nov 2013 01:26:41 +0000 (08:26 +0700)

diff: restrict pathspec limitations to diff b/f case only

builtin_diff_b_f() needs a path, not pathspec. Other modes in diff
can deal with pathspec just fine. But because of the current
GUARD_PATHSPEC() location, other modes also reject :(glob) and
:(icase).

Move GUARD_PATHSPEC(), and the "path" assignment statement, which is
the reason of this GUARD_PATHSPEC(), inside builtin_diff_b_f().

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

Git 1.8.5-rc3 v1.8.5-rc3Junio C Hamano Wed, 20 Nov 2013 19:18:25 +0000 (11:18 -0800)

Git 1.8.5-rc3

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

Sync with 1.8.4.4Junio C Hamano Wed, 20 Nov 2013 19:26:59 +0000 (11:26 -0800)

Sync with 1.8.4.4

Git 1.8.4.4 v1.8.4.4Junio C Hamano Wed, 20 Nov 2013 19:26:08 +0000 (11:26 -0800)

Git 1.8.4.4

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

Merge branch 'mb/relnotes-1.8.5-fix'Junio C Hamano Wed, 20 Nov 2013 19:15:25 +0000 (11:15 -0800)

Merge branch 'mb/relnotes-1.8.5-fix'

* mb/relnotes-1.8.5-fix:
RelNotes: spelling & grammar fixes

RelNotes: spelling & grammar fixesMarc Branchaud Thu, 14 Nov 2013 17:01:13 +0000 (12:01 -0500)

RelNotes: spelling & grammar fixes

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'nd/literal-pathspecs'Junio C Hamano Mon, 18 Nov 2013 22:31:29 +0000 (14:31 -0800)

Merge branch 'nd/literal-pathspecs'

Fixes a regression on 'master' since v1.8.4.

* nd/literal-pathspecs:
pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)

remote-hg: don't decode UTF-8 paths into Unicode objects

The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again.

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

Documentation/rev-list-options.txt: fix some grammatica... Jason St. John Fri, 15 Nov 2013 01:34:02 +0000 (20:34 -0500)

Documentation/rev-list-options.txt: fix some grammatical issues and typos

Various fixes:

- fix typos (e.g. "show" -> "shown")
- use "regular expression(s)" instead of "regexp" where appropriate
- reword some sentences for easier reading
- fix/improve some grammatical issues (e.g. comma usage)
- add missing articles (e.g. "the")
- change "E-mail" to "email"

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/rev-list-options.txt: fix mark-upJason St. John Fri, 15 Nov 2013 01:34:01 +0000 (20:34 -0500)

Documentation/rev-list-options.txt: fix mark-up

Some the labeled list entries have a blank line between the label
and the body text, and some don't. Use the latter style for
consistency; incidentally, syntax highlighting in Vim works better
if there is no blank line there.

Typeset literal options, commands, and path names in monospace.
When using `literal string` mark-up to do so, there is no need to
escape AsciiDoc special characters with backslashes, so make sure we
don't do so.

Replace some double quotes with proper AsciiDoc quotes
(e.g. ``foo'').

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

State correct usage of literal examples in man pages... Jason St. John Thu, 14 Nov 2013 23:08:45 +0000 (18:08 -0500)

State correct usage of literal examples in man pages in the coding standards

The man pages contain inconsistent usage of backticks vs. single quotes
around options, commands, etc. that are in paragraphs. This commit states
that backticks should always be used around literal examples.

This commit states that "--" and friends should not be escaped
(e.g. use `--pretty=oneline` instead of `\--pretty=oneline`).

This commit also states correct usage for typesetting command usage
examples with inline substitutions.

Thanks-to: Ramkumar Ramachandra <artagnon@gmail.com>
Thanks-to: Stuart Rackham <srackham@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 18 Nov 2013 20:25:28 +0000 (12:25 -0800)

Merge branch 'maint'

Hotfix for recent regression while talking to upload-pack
in a repository with many symbolic refs.

* maint:
Revert "upload-pack: send non-HEAD symbolic refs"

Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano Mon, 18 Nov 2013 20:24:49 +0000 (12:24 -0800)

Merge branch 'jx/branch-vv-always-compare-with-upstream'

Hot-fix for a regression.

* jx/branch-vv-always-compare-with-upstream:
branch: fix --verbose output column alignment

branch: fix --verbose output column alignmentTorstein Hegge Thu, 14 Nov 2013 18:18:01 +0000 (19:18 +0100)

branch: fix --verbose output column alignment

Commit f2e0873 (branch: report invalid tracking branch as gone) removed
an early return from fill_tracking_info() in the path taken when 'git
branch -v' lists a branch in sync with its upstream. This resulted in an
unconditionally added space in front of the subject line:

$ git branch -v
* master f5eb3da commit pushed to upstream
topic f935eb6 unpublished topic

Instead, only add the trailing space if a decoration have been added.

To catch this kind of whitespace breakage in the tests, be a bit less
smart when filtering the output through sed.

Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Revert "upload-pack: send non-HEAD symbolic refs"Junio C Hamano Mon, 18 Nov 2013 18:15:45 +0000 (10:15 -0800)

Revert "upload-pack: send non-HEAD symbolic refs"

This reverts commit 5e7dcad771cb873e278a0571b46910d7c32e2f6c; there
may be unbounded number of symbolic refs in the repository, but the
capability header line in the on-wire protocol has a rather low
length limit.

Documentation/git-log.txt: mark-up fix and minor rephasingJason St. John Wed, 13 Nov 2013 06:21:49 +0000 (01:21 -0500)

Documentation/git-log.txt: mark-up fix and minor rephasing

- typeset options, commands, and paths in monospace;
- typeset references to sections with emphasis;
- replace some double quotes with proper AsciiDoc quotes (e.g. ``foo'');
- use title case when referring to section headings.

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-log: update "--log-size" descriptionJason St. John Wed, 13 Nov 2013 06:21:48 +0000 (01:21 -0500)

Documentation/git-log: update "--log-size" description

"--log-size" was added in commit 9fa3465, and the commit message
contained a satisfactory explanation; however, the man page entry
for it did not describe the actual output format, what the output
meant and what the option was meant to be used for.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.5-rc2 v1.8.5-rc2Junio C Hamano Wed, 13 Nov 2013 20:59:31 +0000 (12:59 -0800)

Git 1.8.5-rc2

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

Merge git://github.com/git-l10n/git-poJunio C Hamano Tue, 12 Nov 2013 19:26:11 +0000 (11:26 -0800)

Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
l10n: de.po: improve error message when pushing to unknown upstream
l10n: de.po: translate 68 new messages
po/TEAMS: update Thomas Rast's email address
l10n: Update Swedish translation (2194t0f0u)
l10n: fr.po 2194/1294 messages translated
l10n: zh_CN.po: translate 68 messages (2194t0f0u)
l10n: vi.po (2194t): Update and minor fix
l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)

Correct word usage of "timezone" in "Documentation... Jason St. John Sat, 9 Nov 2013 00:48:52 +0000 (19:48 -0500)

Correct word usage of "timezone" in "Documentation" directory

"timezone" is two words, not one (i.e. "time zone" is correct).

Correct this in these files:
-- date-formats.txt
-- git-blame.txt
-- git-cvsimport.txt
-- git-fast-import.txt
-- git-svn.txt
-- gitweb.conf.txt
-- rev-list-options.txt

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

contrib: typofixesMasanari Iida Tue, 12 Nov 2013 15:17:45 +0000 (00:17 +0900)

contrib: typofixes

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/technical/http-protocol.txt: typofixesMasanari Iida Tue, 12 Nov 2013 15:17:43 +0000 (00:17 +0900)

Documentation/technical/http-protocol.txt: typofixes

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

typofixes: fix misspelt commentsMasanari Iida Tue, 12 Nov 2013 15:17:42 +0000 (00:17 +0900)

typofixes: fix misspelt comments

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

l10n: de.po: improve error message when pushing to... Ralf Thielow Fri, 8 Nov 2013 19:34:35 +0000 (20:34 +0100)

l10n: de.po: improve error message when pushing to unknown upstream

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>

l10n: de.po: translate 68 new messagesRalf Thielow Sat, 2 Nov 2013 17:58:52 +0000 (18:58 +0100)

l10n: de.po: translate 68 new messages

Translate 68 new messages came from git.pot update in 727b957
(l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>

po/TEAMS: update Thomas Rast's email addressRalf Thielow Sat, 2 Nov 2013 17:56:14 +0000 (18:56 +0100)

po/TEAMS: update Thomas Rast's email address

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>

git-fetch-pack uses URLs like git-fetchTorsten Bögershausen Fri, 8 Nov 2013 17:54:05 +0000 (18:54 +0100)

git-fetch-pack uses URLs like git-fetch

"git fetch-pack" allows [<host>:]<directory> to point out the source
repository.
Use the term <repository>, which is already used in "git fetch" or "git pull"
to describe URLs supported by Git.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin Sun, 10 Nov 2013 00:48:23 +0000 (08:48 +0800)

Merge remote-tracking branch 'sv/nafmo/master'

* sv/nafmo/master:
l10n: Update Swedish translation (2194t0f0u)

l10n: Update Swedish translation (2194t0f0u)Peter Krefting Tue, 2 Jul 2013 12:09:37 +0000 (13:09 +0100)

l10n: Update Swedish translation (2194t0f0u)

And fix a typo.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>

l10n: fr.po 2194/1294 messages translatedJean-Noel Avila Fri, 1 Nov 2013 14:35:08 +0000 (15:35 +0100)

l10n: fr.po 2194/1294 messages translated

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>

Sync with 1.8.4.3Junio C Hamano Fri, 8 Nov 2013 20:08:43 +0000 (12:08 -0800)

Sync with 1.8.4.3

Git 1.8.4.3 v1.8.4.3Junio C Hamano Fri, 8 Nov 2013 20:06:19 +0000 (12:06 -0800)

Git 1.8.4.3

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

Merge branch 'jn/test-prereq-perl-doc' into maintJunio C Hamano Fri, 8 Nov 2013 20:01:58 +0000 (12:01 -0800)

Merge branch 'jn/test-prereq-perl-doc' into maint

The interaction between use of Perl in our test suite and NO_PERL
has been clarified a bit.

* jn/test-prereq-perl-doc:
t/README: tests can use perl even with NO_PERL

Merge branch 'ap/remote-hg-unquote-cquote' into maintJunio C Hamano Fri, 8 Nov 2013 20:01:13 +0000 (12:01 -0800)

Merge branch 'ap/remote-hg-unquote-cquote' into maint

A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper (in contrib/)
forgot to unquote such a path.

* ap/remote-hg-unquote-cquote:
remote-hg: unquote C-style paths when exporting

Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano Fri, 8 Nov 2013 19:38:00 +0000 (11:38 -0800)

Merge branch 'jc/upload-pack-send-symref' into maint

One long-standing flaw in the pack transfer protocol used by "git
clone" was that there was no way to tell the other end which branch
"HEAD" points at, and the receiving end needed to guess. A new
capability has been defined in the pack protocol to convey this
information so that cloning from a repository with more than one
branches pointing at the same commit where the HEAD is at now
reliably sets the initial branch in the resulting repository.

* jc/upload-pack-send-symref:
t5570: Update for clone-progress-to-stderr branch
t5570: Update for symref capability
clone: test the new HEAD detection logic
connect: annotate refs with their symref information in get_remote_head()
connect.c: make parse_feature_value() static
upload-pack: send non-HEAD symbolic refs
upload-pack: send symbolic ref information as capability
upload-pack.c: do not pass confusing cb_data to mark_our_ref()
t5505: fix "set-head --auto with ambiguous HEAD" test

Merge branch 'jk/http-auth-redirects' into maintJunio C Hamano Fri, 8 Nov 2013 19:37:25 +0000 (11:37 -0800)

Merge branch 'jk/http-auth-redirects' into maint

We did not handle cases where http transport gets redirected during
the authorization request (e.g. from http:// to https://).

* jk/http-auth-redirects:
http.c: Spell the null pointer as NULL
remote-curl: rewrite base url from info/refs redirects
remote-curl: store url as a strbuf
remote-curl: make refs_url a strbuf
http: update base URLs when we see redirects
http: provide effective url to callers
http: hoist credential request out of handle_curl_result
http: refactor options to http_get_*
http_request: factor out curlinfo_strbuf
http_get_file: style fixes

Sync with maintJunio C Hamano Thu, 7 Nov 2013 22:41:25 +0000 (14:41 -0800)

Sync with maint

* maint:
Start preparing for 1.8.4.3
gitignore.txt: fix documentation of "**" patterns

Start preparing for 1.8.4.3Junio C Hamano Thu, 7 Nov 2013 22:39:47 +0000 (14:39 -0800)

Start preparing for 1.8.4.3

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

Merge branch 'sc/doc-howto-dumb-http' into maintJunio C Hamano Thu, 7 Nov 2013 22:37:39 +0000 (14:37 -0800)

Merge branch 'sc/doc-howto-dumb-http' into maint

An ancient How-To on serving Git repositories on an HTTP server
lacked a warning that it has been mostly superseded with more
modern way.

* sc/doc-howto-dumb-http:
doc/howto: warn about (dumb)http server document being too old

Merge branch 'vd/doc-unpack-objects' into maintJunio C Hamano Thu, 7 Nov 2013 22:37:35 +0000 (14:37 -0800)

Merge branch 'vd/doc-unpack-objects' into maint

The synopsis section of "git unpack-objects" documentation has been
clarified a bit.

* vd/doc-unpack-objects:
Documentation: "pack-file" is not literal in unpack-objects
Documentation: restore a space in unpack-objects usage

Merge branch 'jk/subtree-install-fix' into maintJunio C Hamano Thu, 7 Nov 2013 22:37:17 +0000 (14:37 -0800)

Merge branch 'jk/subtree-install-fix' into maint

We did not generate HTML version of documentation to "git subtree"
in contrib/.

* jk/subtree-install-fix:
subtree: add makefile target for html docs

Merge branch 'hn/log-graph-color-octopus' into maintJunio C Hamano Thu, 7 Nov 2013 22:37:11 +0000 (14:37 -0800)

Merge branch 'hn/log-graph-color-octopus' into maint

Coloring around octopus merges in "log --graph" output was screwy.

* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges

Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano Thu, 7 Nov 2013 22:36:59 +0000 (14:36 -0800)

Merge branch 'mm/checkout-auto-track-fix' into maint

"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".

* mm/checkout-auto-track-fix:
checkout: proper error message on 'git checkout foo bar --'
checkout: allow dwim for branch creation for "git checkout $branch --"

Merge branch 'sg/prompt-svn-remote-fix' into maintJunio C Hamano Thu, 7 Nov 2013 22:36:45 +0000 (14:36 -0800)

Merge branch 'sg/prompt-svn-remote-fix' into maint

Bash prompting code to deal with an SVN remote as an upstream
were coded in a way not supported by older Bash versions (3.x).

* sg/prompt-svn-remote-fix:
bash prompt: don't use '+=' operator in show upstream code path

Merge branch 'jk/split-broken-ident' into maintJunio C Hamano Thu, 7 Nov 2013 22:34:51 +0000 (14:34 -0800)

Merge branch 'jk/split-broken-ident' into maint

The fall-back parsing of commit objects with broken author or
committer lines were less robust than ideal in picking up the
timestamps.

* jk/split-broken-ident:
split_ident: parse timestamp from end of line

Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano Thu, 7 Nov 2013 22:34:14 +0000 (14:34 -0800)

Merge branch 'jc/revision-range-unpeel' into maint

"git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
output, but "git rev-list --objects v1.0^..v1.0" did not.

* jc/revision-range-unpeel:
revision: do not peel tags used in range notation

gitignore.txt: fix documentation of "**" patternsKarsten Blees Thu, 7 Nov 2013 16:30:47 +0000 (17:30 +0100)

gitignore.txt: fix documentation of "**" patterns

"**" means bold in ASCIIDOC, so we need to escape it.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.5-rc1 v1.8.5-rc1Junio C Hamano Wed, 6 Nov 2013 22:35:19 +0000 (14:35 -0800)

Git 1.8.5-rc1

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

Merge branch 'fc/trivial'Junio C Hamano Wed, 6 Nov 2013 22:34:43 +0000 (14:34 -0800)

Merge branch 'fc/trivial'

A random collection of style fixes and minor doc updates.

* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option

sha1_loose_object_info(): do not return success on... Junio C Hamano Wed, 6 Nov 2013 18:00:57 +0000 (10:00 -0800)

sha1_loose_object_info(): do not return success on missing object

Since 052fe5ea (sha1_loose_object_info: make type lookup optional,
2013-07-12), sha1_loose_object_info() returns happily without
checking if the object in question exists, which is not what the the
caller sha1_object_info_extended() expects; the caller does not even
bother checking the existence of the object itself.

Noticed-by: Sven Brauch <svenbrauch@googlemail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.8.5Junio C Hamano Mon, 4 Nov 2013 23:05:08 +0000 (15:05 -0800)

Update draft release notes to 1.8.5

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

Merge branch 'bw/solaris-sed-tr-test-portability'Junio C Hamano Mon, 4 Nov 2013 22:58:19 +0000 (14:58 -0800)

Merge branch 'bw/solaris-sed-tr-test-portability'

* bw/solaris-sed-tr-test-portability:
t4015: simplify sed command that is not even seen by sed
Avoid difference in tr semantics between System V and BSD
Change sed i\ usage to something Solaris' sed can handle

Merge branch 'vd/doc-unpack-objects'Junio C Hamano Mon, 4 Nov 2013 22:58:15 +0000 (14:58 -0800)

Merge branch 'vd/doc-unpack-objects'

* vd/doc-unpack-objects:
Documentation: "pack-file" is not literal in unpack-objects
Documentation: restore a space in unpack-objects usage

Merge branch 'jk/duplicate-objects-in-packs'Junio C Hamano Mon, 4 Nov 2013 22:58:10 +0000 (14:58 -0800)

Merge branch 'jk/duplicate-objects-in-packs'

Test fixup to a topic recently graduated.

* jk/duplicate-objects-in-packs:
Fix '\%o' for printf from coreutils

Merge branch 'jk/subtree-install-fix'Junio C Hamano Mon, 4 Nov 2013 22:58:08 +0000 (14:58 -0800)

Merge branch 'jk/subtree-install-fix'

* jk/subtree-install-fix:
subtree: add makefile target for html docs