git/git.git
13 years agodiff.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:53:56 +0000 (10:53 -0800)]
diff.c: guard config parser from value=NULL

diff.external, diff.*.command, diff.color.*, color.diff.* and
diff.*.funcname configuration variables expect a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoconvert.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:53:36 +0000 (10:53 -0800)]
convert.c: guard config parser from value=NULL

filter.*.smudge and filter.*.clean configuration variables expect a
string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoconnect.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:52:15 +0000 (10:52 -0800)]
connect.c: guard config parser from value=NULL

core.gitproxy configuration expects a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-tag.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:51:31 +0000 (10:51 -0800)]
builtin-tag.c: guard config parser from value=NULL

user.signingkey configuration expects a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-show-branch.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:51:03 +0000 (10:51 -0800)]
builtin-show-branch.c: guard config parser from value=NULL

showbranch.default configuration expects a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-reflog.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:50:06 +0000 (10:50 -0800)]
builtin-reflog.c: guard config parser from value=NULL

gc.reflogexpire and gc.reflogexpireunreachable configuration expect
 a string value suitable for calling approxidate() with.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-log.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:48:55 +0000 (10:48 -0800)]
builtin-log.c: guard config parser from value=NULL

format.subjectprefix configuration expects a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-config.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:48:12 +0000 (10:48 -0800)]
builtin-config.c: guard config parser from value=NULL

color configuration variables expect a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-commit.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:46:39 +0000 (10:46 -0800)]
builtin-commit.c: guard config parser from value=NULL

commit.template configuration expects a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-branch.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:45:50 +0000 (10:45 -0800)]
builtin-branch.c: guard config parser from value=NULL

color.branch.* configuration variables expect a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-apply.c: guard config parser from value=NULL
Junio C Hamano [Mon, 11 Feb 2008 18:44:49 +0000 (10:44 -0800)]
builtin-apply.c: guard config parser from value=NULL

apply.whitespace configuration expects a string value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd config_error_nonbool() helper function
Junio C Hamano [Mon, 11 Feb 2008 18:41:18 +0000 (10:41 -0800)]
Add config_error_nonbool() helper function

This is used to report misconfigured configuration file that does not
give any value to a non-boolean variable, e.g.

[section]
var

It is perfectly fine to say it if the section.var is a boolean (it means
true), but if a variable expects a string value it should be flagged as
a configuration error.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-gc.c: guard config parser from value=NULL
Miklos Vajna [Fri, 8 Feb 2008 14:26:18 +0000 (15:26 +0100)]
builtin-gc.c: guard config parser from value=NULL

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoarchive-tar.c: guard config parser from value=NULL
Junio C Hamano [Sat, 9 Feb 2008 04:38:22 +0000 (20:38 -0800)]
archive-tar.c: guard config parser from value=NULL

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoWork around curl-gnutls not liking to be reinitialized
Mike Hommey [Sat, 9 Feb 2008 09:41:36 +0000 (10:41 +0100)]
Work around curl-gnutls not liking to be reinitialized

curl versions 7.16.3 to 7.18.0 included had a regression in which https
requests following curl_global_cleanup/init sequence would fail with ASN1
parser errors with curl-gnutls. Such sequences happen in some cases such
as git fetch.

We work around this by removing the http_init and http_cleanup calls from
get_refs_via_curl, replacing them with a transport->data initialization
with the http_walker (which does http_init).

While the http_walker is not currently used in get_refs_via_curl, http
and walker code refactor will make it use it.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoman pages are littered with .ft C and others
Jonas Fonseca [Mon, 4 Feb 2008 22:01:20 +0000 (23:01 +0100)]
man pages are littered with .ft C and others

Jakub Narebski <jnareb@gmail.com> wrote Sun, Feb 03, 2008:
> Junio C Hamano wrote:
> > Jakub Narebski <jnareb@gmail.com> writes:
> >
> > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458
> Julian Phillips:
> > Are you using docbook xsl 1.72?  There are known problems building the
> > manpages with that version.  1.71 works, and 1.73 should work when it get
> > released.

I was able to solve this problem with this patch, which adds a XSL file
used specifically for DOCBOOK_XSL_172=YesPlease and where dots and
backslashes are escaped properly so they won't be substituted to the
wrong thing further down the "DocBook XSL pipeline". Doing the escaping
in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end
this part of the manpage nightmare.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd a BuildRequires for gettext in the spec file.
James Bowes [Mon, 4 Feb 2008 13:13:07 +0000 (08:13 -0500)]
Add a BuildRequires for gettext in the spec file.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agopack-objects: only throw away data during memory pressure
Martin Koegler [Mon, 11 Feb 2008 07:26:25 +0000 (08:26 +0100)]
pack-objects: only throw away data during memory pressure

If pack-objects hit the memory limit, it deletes objects from the delta
window.

This patch make it only delete the data, which is recomputed, if needed again.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-commit: remove .git/SQUASH_MSG upon successful commit
Gerrit Pape [Fri, 8 Feb 2008 09:53:58 +0000 (09:53 +0000)]
builtin-commit: remove .git/SQUASH_MSG upon successful commit

After doing a merge --squash, and commit afterwards, the commit message
template SQUASH_MSG in the git directory is not removed, which means that
the content of SQUASH_MSG is used as default commit message for all
subsequent commits.  So have git commit remove the file SQUASH_MSG from
the git directory upon a successful commit.

The problem was discovered by Frédéric Brière, reported through
 http://bugs.debian.org/464656

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMake git prune remove temporary packs that look like write failures
David Steven Tweed [Thu, 7 Feb 2008 02:55:14 +0000 (02:55 +0000)]
Make git prune remove temporary packs that look like write failures

Write errors when repacking (eg, due to out-of-space conditions)
can leave temporary packs (and possibly other files beginning
with "tmp_") lying around which no existing
codepath removes and which aren't obvious to the casual user.
These can also be multi-megabyte files wasting noticeable space.
Unfortunately there's no way to definitely tell in builtin-prune
that a tmp_ file is not being used by a concurrent process,
such as a fetch. However, it is documented that pruning should
only be done on a quiet repository and --expire is honoured
(using code from Johannes Schindelin, along with a test case
he wrote) so that its safety is the same as that of loose
object pruning.

Since they might be signs of a problem (unlike orphaned loose
objects) the names of any removed files are printed.

Signed-off-by: David Tweed (david.tweed@gmail.com)
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agorebase -i: accept -m as advertised in the man page
Uwe Kleine-K\e,Av\e(Bnig [Mon, 11 Feb 2008 13:45:26 +0000 (14:45 +0100)]
rebase -i: accept -m as advertised in the man page

Signed-off-by: Uwe Kleine-K\e,Av\e(Bnig <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocument that the default of branch.autosetupmerge is true
Johannes Schindelin [Mon, 11 Feb 2008 11:27:20 +0000 (11:27 +0000)]
Document that the default of branch.autosetupmerge is true

In 34a3e69 (git-branch: default to --track) the default was changed to
true, to help new git users.  But yours truly forgot to update the
documentation.  This fixes it.

Noticed by Kalle Olavi Niemitalo.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobisect: allow starting with a detached HEAD
Johannes Schindelin [Sun, 10 Feb 2008 13:59:50 +0000 (13:59 +0000)]
bisect: allow starting with a detached HEAD

Instead of insisting on a symbolic ref, bisect now accepts detached
HEADs, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-pull documentation: fix markup
Junio C Hamano [Mon, 11 Feb 2008 19:22:01 +0000 (11:22 -0800)]
git-pull documentation: fix markup

A note paragraph was mistakenly made into an indented monospace display.
Noticed by Miklos Vajna.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoconfig: Fix --unset for continuation lines
Frank Lichtenheld [Mon, 11 Feb 2008 00:23:03 +0000 (01:23 +0100)]
config: Fix --unset for continuation lines

find_beginning_of_line didn't take into account that the
previous line might have ended with \ in which case it shouldn't
stop but continue its search.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix typo in 'blame' documentation. v1.5.4.1
Tim Stoakes [Sun, 10 Feb 2008 04:19:08 +0000 (14:49 +1030)]
Fix typo in 'blame' documentation.

Signed-off-by: Tim Stoakes <tim@stoakes.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitattributes: fix relative path matching
Junio C Hamano [Thu, 7 Feb 2008 08:02:08 +0000 (00:02 -0800)]
gitattributes: fix relative path matching

There was an embarrassing pair of off-by-one miscounting that
failed to match path "a/b/c" when "a/.gitattributes" tried to
name it with relative path "b/c".

This fixes it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix parsing numeric color values
Timo Hirvonen [Wed, 6 Feb 2008 12:16:08 +0000 (14:16 +0200)]
Fix parsing numeric color values

Numeric color only worked if it was at end of line.
Noticed by Chris Larson <clarson@kergoth.com>.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoINSTALL: git-merge no longer uses cpio
Gerrit Pape [Wed, 6 Feb 2008 07:03:53 +0000 (07:03 +0000)]
INSTALL: git-merge no longer uses cpio

Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio
anymore, adapt the documentation.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-remote documentation: fix synopsis to match description
Jörg Sommer [Sat, 2 Feb 2008 23:58:07 +0000 (00:58 +0100)]
git-remote documentation: fix synopsis to match description

In the text, the argument of -m is <master> which should be used in the
command synopsis, too.

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-am: fix type in its usage string
Jörg Sommer [Sat, 2 Feb 2008 23:58:06 +0000 (00:58 +0100)]
git-am: fix type in its usage string

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix "git-commit -C $tag"
Junio C Hamano [Sun, 3 Feb 2008 08:00:09 +0000 (00:00 -0800)]
Fix "git-commit -C $tag"

The scripted version might not have handled this correctly
either, but the version rewritten in C definitely does not grok
this and complains $tag is not a commit object.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
Jari Aalto [Sat, 2 Feb 2008 14:03:48 +0000 (16:03 +0200)]
Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)

Adjust the command syntax to better reflect the call parameters:
[save] [message...] => [save [<message>]].

Signed-off-by: Jari Aalto <jari.aalto AT cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate stale documentation links from the main documentation.
Junio C Hamano [Sat, 2 Feb 2008 04:40:30 +0000 (20:40 -0800)]
Update stale documentation links from the main documentation.

This could have been part of the 1.5.4 commit, but it isn't.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.4 v1.5.4
Junio C Hamano [Sat, 2 Feb 2008 03:10:10 +0000 (19:10 -0800)]
GIT 1.5.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix "git checkout -b foo ':/substring'"
Junio C Hamano [Sat, 2 Feb 2008 03:06:56 +0000 (19:06 -0800)]
Fix "git checkout -b foo ':/substring'"

Because ':/substring' extended SHA1 expression cannot take
postfix modifiers such as ^{tree} and ^{commit}, we would need
to do it in multiple steps.  With the patch, you can start a new
branch from a randomly-picked commit whose message has the named
string in it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix typo in a comment in t/test-lib.sh
Michele Ballabio [Thu, 31 Jan 2008 21:59:11 +0000 (22:59 +0100)]
Fix typo in a comment in t/test-lib.sh

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit rev-parse manpage: spelling fix
Miklos Vajna [Thu, 31 Jan 2008 19:55:57 +0000 (20:55 +0100)]
git rev-parse manpage: spelling fix

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoRevert "filter-branch docs: remove brackets so not to imply revision arg is optional"
Junio C Hamano [Thu, 31 Jan 2008 21:51:42 +0000 (13:51 -0800)]
Revert "filter-branch docs: remove brackets so not to imply revision arg is optional"

This reverts commit c41b439244c51b30c60953192816afc91e552578, as
we decided to default to HEAD when revision parameters are missing
and they are no longer mandatory.

13 years agoDocumentation/git-cvsserver: Fix typo
Jean-Luc Herren [Thu, 31 Jan 2008 02:06:04 +0000 (03:06 +0100)]
Documentation/git-cvsserver: Fix typo

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: assume HEAD if no revision supplied
Brandon Casey [Wed, 30 Jan 2008 19:33:04 +0000 (13:33 -0600)]
filter-branch: assume HEAD if no revision supplied

filter-branch previously took the first non-option argument as the name for
a new branch. Since dfd05e38, it now takes a revision or a revision range
and modifies the current branch. Update to operate on HEAD by default to
conform with standard git interface practice.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch docs: remove brackets so not to imply revision arg is optional
Brandon Casey [Thu, 31 Jan 2008 00:41:25 +0000 (18:41 -0600)]
filter-branch docs: remove brackets so not to imply revision arg is optional

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUse 'printf %s $x' notation in t5401
Shawn O. Pearce [Wed, 30 Jan 2008 06:21:56 +0000 (01:21 -0500)]
Use 'printf %s $x' notation in t5401

We only care about getting what should be an empty string and
sending it to a file, without a trailing LF, so the empty string
translates into a 0 byte file.  Earlier when I originally wrote
these lines Mac OS X allowed the format string of printf to be
the empty string, but more recent versions appear to have been
'improved' with error messages if the format is not given.

This may cause problems if we ever wind up with changes to the hook
tests.  A minor cleanup makes the test more safe on all systems,
by conforming to accepted printf conventions.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch.sh: remove temporary directory on failure
Brandon Casey [Mon, 28 Jan 2008 21:16:02 +0000 (15:16 -0600)]
filter-branch.sh: remove temporary directory on failure

One of the first things filter-branch does is to create a temporary
directory. This directory is eventually removed by the script during
normal operation, but is not removed if the script encounters an error.

Set a trap to remove it when the script terminates for any reason.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-relink: avoid hard linking in objects/info directory
Brandon Casey [Tue, 29 Jan 2008 22:41:30 +0000 (16:41 -0600)]
git-relink: avoid hard linking in objects/info directory

git-relink is intended to search for packs and loose objects in
common between two repositories and to replace the one set with
hard links to the other. Files other than packs and loose objects
should not be touched, so add the "info" sub-directory to the
pattern of directory excludes.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitweb: Make use of the $git_dir variable at sub git_get_project_description
Bruno Ribas [Wed, 30 Jan 2008 05:37:56 +0000 (03:37 -0200)]
gitweb: Make use of the $git_dir variable at sub git_get_project_description

Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitweb: Add info about $projectroot and $projects_list to gitweb/README
Jakub Narebski [Tue, 29 Jan 2008 19:52:32 +0000 (20:52 +0100)]
gitweb: Add info about $projectroot and $projects_list to gitweb/README

Those two configuration variables are important enough that it is
worth to explicitely write about them in the "Gitweb config file
variables" section even if they are usually set during build by
GITWEB_PROJECTROOT and GITWEB_LIST build (Makefile) configuration
variables.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofix doc typos
Jim Meyering [Tue, 29 Jan 2008 19:38:55 +0000 (20:38 +0100)]
fix doc typos

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoreflog-expire: Avoid creating new files in a directory inside readdir(3) loop
Junio C Hamano [Sat, 26 Jan 2008 07:53:05 +0000 (23:53 -0800)]
reflog-expire: Avoid creating new files in a directory inside readdir(3) loop

"git reflog expire --all" opened a directory in $GIT_DIR/logs/,
read reflog files in there readdir(3), and rewrote the file by
creating a new file and renaming it back inside the loop.  This
code structure can cause the newly created file to be returned
by subsequent call to readdir(3), and fall into an infinite loop
in the worst case.

This separates the processing to two phase.  Running
for_each_reflog() to find out and collect all refs, and then
iterate over them, calling expire_reflog().  This way, the
program would behave exactly the same way as if all the refs
were given by the user from the command line.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitweb: Convert generated contents to utf8 in commitdiff_plain
Yasushi SHOJI [Tue, 29 Jan 2008 12:16:02 +0000 (21:16 +0900)]
gitweb: Convert generated contents to utf8 in commitdiff_plain

If the commit message, or commit author contains non-ascii, it must be
converted from Perl internal representation to utf-8, to follow what
got declared in HTTP header.  Use to_utf8() to do the conversion.

This necessarily replaces here-doc with "print" statements.

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Acked-by: İsmail Dönmez <ismail@pardus.org.tr>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoinstaweb: use 'browser.<tool>.path' config option if it's set.
Christian Couder [Tue, 29 Jan 2008 06:08:44 +0000 (07:08 +0100)]
instaweb: use 'browser.<tool>.path' config option if it's set.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation: help: specify supported html browsers.
Christian Couder [Tue, 29 Jan 2008 06:08:29 +0000 (07:08 +0100)]
Documentation: help: specify supported html browsers.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation: config: add "browser.<tool>.path".
Christian Couder [Tue, 29 Jan 2008 06:08:22 +0000 (07:08 +0100)]
Documentation: config: add "browser.<tool>.path".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd test for rebase -i with commits that do not pass pre-commit
Johannes Schindelin [Mon, 28 Jan 2008 16:33:28 +0000 (16:33 +0000)]
Add test for rebase -i with commits that do not pass pre-commit

This accompanies c5b09feb786f6a2456ec3d8203d0f4d67f09f043 (Avoid
update hook during git-rebase --interactive) to make sure that
any regression to make Debian's Bug#458782 (git-core: git-rebase
doesn't work when trying to squash changes into commits created
with --no-verify) resurface will be caught.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot9001: add missing && operators
Jeff King [Tue, 22 Jan 2008 03:23:53 +0000 (22:23 -0500)]
t9001: add missing && operators

The exit value of some commands was not being used for the
test output.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.4-rc5 v1.5.4-rc5
Junio C Hamano [Sun, 27 Jan 2008 02:39:41 +0000 (18:39 -0800)]
GIT 1.5.4-rc5

Hopefully the last rc before the final...

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agopull --rebase: be cleverer with rebased upstream branches
Johannes Schindelin [Sat, 26 Jan 2008 18:04:37 +0000 (18:04 +0000)]
pull --rebase: be cleverer with rebased upstream branches

When the upstream branch is tracked, we can detect if that branch
was rebased since it was last fetched.  Teach git to use that
information to rebase from the old remote head onto the new remote head.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Fix for histories with multiple roots
Steffen Prohaska [Sat, 26 Jan 2008 09:54:06 +0000 (10:54 +0100)]
cvsserver: Fix for histories with multiple roots

Git histories may have multiple roots, which can cause
git merge-base to fail and this caused git cvsserver to die.

This commit teaches git cvsserver to handle a failing git
merge-base gracefully, and modifies the test case to verify this.
All the test cases now use a history with two roots.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
 git-cvsserver.perl              |    9 ++++++++-
 t/t9400-git-cvsserver-server.sh |   10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot9400-git-cvsserver-server: Wrap setup into test case
Steffen Prohaska [Sat, 26 Jan 2008 09:54:05 +0000 (10:54 +0100)]
t9400-git-cvsserver-server: Wrap setup into test case

It is preferable to have the test setup in a test case.  The
setup itself may fail and having it as a test case handles this
situation more gracefully.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation: add a bit about sendemail.to configuration
Mike Hommey [Sat, 26 Jan 2008 11:04:30 +0000 (12:04 +0100)]
Documentation: add a bit about sendemail.to configuration

While there is information about this in the configuration section, it was
missing in the options section.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoparse-options: catch likely typo in presense of aggregated options.
Pierre Habouzit [Sat, 26 Jan 2008 11:26:57 +0000 (12:26 +0100)]
parse-options: catch likely typo in presense of aggregated options.

If options are aggregated, and that the whole token is an exact
prefix of a long option that is longer than 2 letters, reject
it.  This is to prevent a common typo:

$ git commit -amend

to get interpreted as "commit all with message 'end'".

The typo check isn't performed if there is no aggregation,
because the stuck form is the recommended one.  If we have `-o`
being a valid short option that takes an argument, and --option
a long one, then we _MUST_ accept -option as "'o' option with
argument 'ption'", which is our official recommended form.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd a missing dependency on http.h
Mike Hommey [Sat, 26 Jan 2008 12:19:02 +0000 (13:19 +0100)]
Add a missing dependency on http.h

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit pull manpage: don't include -n from fetch-options.txt
Miklos Vajna [Fri, 25 Jan 2008 10:17:38 +0000 (10:17 +0000)]
git pull manpage: don't include -n from fetch-options.txt

The -n option stands for --no-summary in git pull

[jes: reworded the description to avoid mentioning 'git-fetch';
 also exclude '-n' conditional on git-pull -- ugly because of
 the missing "else" statement in asciidoc]

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-svn(1): update instructions for resuming a git-svn clone
Sam Vilain [Thu, 24 Jan 2008 23:10:02 +0000 (12:10 +1300)]
git-svn(1): update instructions for resuming a git-svn clone

git-svn expects its references under refs/remotes/*; but these will
not be copied or set by "git clone"; put in this man page the manual
fiddling that is required with current git-svn to get this to work.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoautoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.
Jakub Narebski [Fri, 25 Jan 2008 11:19:41 +0000 (12:19 +0100)]
autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.

Pre-POSIX.1-2001 systems don't have <sys/select.h>, but select(2)
is declared in <sys/time.h>, which git-compat-util.h includes.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMakefile: customization for supporting HP-UX
Robert Schiele [Thu, 24 Jan 2008 18:35:20 +0000 (19:35 +0100)]
Makefile: customization for supporting HP-UX

Signed-off-by: Robert Schiele <rschiele@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agopre-POSIX.1-2001 systems do not have <sys/select.h>
Robert Schiele [Thu, 24 Jan 2008 18:34:46 +0000 (19:34 +0100)]
pre-POSIX.1-2001 systems do not have <sys/select.h>

POSIX.1-2001 has declaration of select(2) in <sys/select.h>, but
in the previous version of SUS, it was declared in <sys/time.h>
(which is already included in git-compat-util.h).

This introduces NO_SYS_SELECT_H macro in the Makefile to be set
on older systems, to skip inclusion of <sys/select.h> that does
not exist on them.

We could check _POSIX_VERSION with 200112L and do this
automatically, but earlier it was reported that the approach
does not work well on some vintage of HP-UX.  Other systems may
get _POSIX_VERSION itself wrong.  At least for now, this manual
configuration is safer.

Signed-off-by: Robert Schiele <rschiele@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Thu, 24 Jan 2008 05:37:12 +0000 (21:37 -0800)]
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Correctly cleanup msgfmt '1 message untranslated' output
  git-gui: Make the statistics of po2msg match those of msgfmt
  git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
  git-gui: Work around random missing scrollbar in revision list

13 years agogit-commit: exit non-zero if we fail to commit the index
Brandon Casey [Wed, 23 Jan 2008 17:21:22 +0000 (11:21 -0600)]
git-commit: exit non-zero if we fail to commit the index

In certain rare cases, the creation of the commit object
and update of HEAD can succeed, but then installing the
updated index will fail. This is most likely caused by a
full disk or exceeded disk quota. When this happens the
new index file will be removed, and the repository will
be left with the original now-out-of-sync index. The
user can recover with a "git reset HEAD" once the disk
space issue is resolved.

We should detect this failure and offer the user some
helpful guidance.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-clone -s: document problems with git gc --prune
Miklos Vajna [Tue, 22 Jan 2008 22:12:25 +0000 (23:12 +0100)]
git-clone -s: document problems with git gc --prune

There is a scenario when using git clone -s and git gc --prune togother is
dangerous. Document this.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-gui: Correctly cleanup msgfmt '1 message untranslated' output gitgui-0.9.2
Shawn O. Pearce [Wed, 23 Jan 2008 04:56:15 +0000 (23:56 -0500)]
git-gui: Correctly cleanup msgfmt '1 message untranslated' output

In the multiple message case we remove the word "messages" from the
statistics output of msgfmt as it looks cleaner on the tty when you
are watching the build process.  However we failed to strip the word
"message" when only 1 message was found to be untranslated or fuzzy,
as msgfmt does not produce the 's' suffix.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Make the statistics of po2msg match those of msgfmt
Shawn O. Pearce [Wed, 23 Jan 2008 04:52:07 +0000 (23:52 -0500)]
git-gui: Make the statistics of po2msg match those of msgfmt

The strings we were showing from po2msg didn't exactly match those
of msgfmt's --statistics output so we didn't show quite the same
results when building git-gui's message files.  Now we're closer
to what msgfmt shows (at least for an en_US locale) so the make
output matches.

I noticed that the fuzzy translation count is off by one for the
current po/zh_cn.po file.  Not sure why and I'm not going to try
and debug it at this time as the po2msg is strictly a fallback,
users building from source really should prefer msgfmt.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
Shawn O. Pearce [Wed, 23 Jan 2008 04:44:36 +0000 (23:44 -0500)]
git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available

If msgfmt fails with exit code 127 that typically means the program
is not found in the user's PATH and thus cannot be executed by make.
In such a case we can try to fallback to the Tcl based po2msg program
that we distributed with git-gui, as it does a "good enough" job.

We still don't default to po2msg.sh however as it does not perform
a lot of the sanity checks that msgfmt does, and quite a few of
those are too useful to give up.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Work around random missing scrollbar in revision list
Shawn O. Pearce [Tue, 22 Jan 2008 15:40:13 +0000 (10:40 -0500)]
git-gui: Work around random missing scrollbar in revision list

If the horizontal scrollbar isn't currently visible (because it has
not been needed) but we get an update to the scroll port we may find
the scrollbar window exists but the Tcl command doesn't.  Apparently
it is possible for Tk to have partially destroyed the scrollbar by
removing the Tcl procedure name but still leaving the widget name in
the window registry.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-svn: default to repacking every 1000 commits
Eric Wong [Mon, 21 Jan 2008 22:37:41 +0000 (14:37 -0800)]
git-svn: default to repacking every 1000 commits

This should reduce disk space usage when doing large imports.
We'll be switching to "gc --auto" post-1.5.4 to handle
repacking for us.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoClarify that http-push being temporarily disabled with older cURL
Junio C Hamano [Tue, 22 Jan 2008 01:34:43 +0000 (17:34 -0800)]
Clarify that http-push being temporarily disabled with older cURL

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agopack-objects: Fix segfault when object count is less than thread count
Nicolas Pitre [Mon, 21 Jan 2008 16:07:15 +0000 (11:07 -0500)]
pack-objects: Fix segfault when object count is less than thread count

When partitioning the work amongst threads, dividing the number of
objects by the number of threads may return 0 when there are less
objects than threads; this will cause the subsequent code to segfault
when accessing list[sub_size-1].  Allow some threads to have
zero objects to work on instead of barfing, while letting others
to have more.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMake t5710 more strict when creating nested repos
Alex Riesen [Mon, 21 Jan 2008 20:53:25 +0000 (21:53 +0100)]
Make t5710 more strict when creating nested repos

The test 'creating too deep nesting' can fail even when cloning the repos,
but is not its main purpose (it has to prepare nested repos and ensure
the last one is invalid). So split the test into the creation and
invalidity checking parts.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agosend-email, fix breakage in combination with --compose
Gustaf Hendeby [Mon, 21 Jan 2008 19:57:46 +0000 (20:57 +0100)]
send-email, fix breakage in combination with --compose

This fixes the subtile bug in git send-email that was introduced into
git send-email with aa54892f5ada8282643dc7387b33261c7135d784 (send-email:
detect invocation errors earlier), which caused no patches to be sent
out if the --compose flag was used.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Tested-by: Seth Falcon <seth@userprimary.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocument the hairy gfi_unpack_entry part of fast-import
Shawn O. Pearce [Mon, 21 Jan 2008 04:37:01 +0000 (23:37 -0500)]
Document the hairy gfi_unpack_entry part of fast-import

Junio pointed out this part of fast-import wasn't very clear on
initial read, and it took some time for someone who was new to
fast-import's "dirty little tricks" to understand how this was
even working.  So a little bit of commentary in the proper place
may help future readers.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoTeach fast-import to honor pack.compression and pack.depth
Shawn O. Pearce [Mon, 21 Jan 2008 04:36:54 +0000 (23:36 -0500)]
Teach fast-import to honor pack.compression and pack.depth

We now use the configured pack.compression and pack.depth values
within fast-import, as like builtin-pack-objects fast-import is
generating a packfile for consumption by the Git tools.

We use the same behavior as builtin-pack-objects does for these
options, allowing core.compression to supply the default value
for pack.compression.

The default setting for pack.depth within fast-import is still 10
as users will generally repack fast-import generated packfiles by
`repack -f`.  A large delta depth within the fast-import packfile
can significantly slow down such a later repack.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agosubmodule: Document the details of the command line syntax
Steffen Prohaska [Mon, 21 Jan 2008 06:41:27 +0000 (07:41 +0100)]
submodule: Document the details of the command line syntax

Only "status" accepts "--cached" and the preferred way of
passing sub-command specific options is after the sub-command.

The documentation is adapted to reflect this.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: add test for the subcommand parser fix
Junio C Hamano [Tue, 15 Jan 2008 11:13:55 +0000 (03:13 -0800)]
git-submodule: add test for the subcommand parser fix

This modifies the existing t7400 test to use 'init' as the
pathname that a submodule is bound to.  Without the earlier
subcommand parser fix, this fails.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: fix subcommand parser
Junio C Hamano [Tue, 15 Jan 2008 10:48:45 +0000 (02:48 -0800)]
git-submodule: fix subcommand parser

The subcommand parser of "git submodule" made its subcommand
names reserved words.  As a consequence, a command like this:

    $ git submodule add init update

which is meant to add a submodule called 'init' at path 'update'
was misinterpreted as a request to invoke more than one mutually
incompatible subcommands and incorrectly rejected.

This patch fixes the issue by stopping the subcommand parsing at
the first subcommand word, to allow the sample command line
above to work as expected.

It also introduces the usual -- option disambiguator, so that a
submodule at path '-foo' can be updated with

    $ git submodule update -- -foo

without triggering an "unrecognized option -foo" error.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: rename shell functions for consistency
Junio C Hamano [Tue, 15 Jan 2008 10:35:49 +0000 (02:35 -0800)]
git-submodule: rename shell functions for consistency

This renames the shell functions used in git-submodule that
implement top-level subcommands.  The rule is that the
subcommand $foo is implemented by cmd_$foo function.

A noteworthy change is that modules_list() is now known as
cmd_status().  There is no "submodule list" command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Mon, 21 Jan 2008 04:36:16 +0000 (20:36 -0800)]
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Correct encoding of glossary/fr.po to UTF-8
  git-gui: Consolidate hook execution code into a single function
  git-gui: Correct window title for hook failure dialogs
  git-gui: Honor the standard commit-msg hook

13 years agogit-gui: Correct encoding of glossary/fr.po to UTF-8
Shawn O. Pearce [Mon, 21 Jan 2008 04:03:23 +0000 (23:03 -0500)]
git-gui: Correct encoding of glossary/fr.po to UTF-8

Junio noticed this was incorrectly added in ISO-8859-1 but it should
be in UTF-8 (as the headers claim UTF-8, and our convention is to use
only UTF-8).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Consolidate hook execution code into a single function
Shawn O. Pearce [Sun, 20 Jan 2008 19:46:59 +0000 (14:46 -0500)]
git-gui: Consolidate hook execution code into a single function

The code we use to test if a hook is executable or not differs on
Cygwin from the normal POSIX case.  Rather then repeating that for
all three hooks we call in our commit code path we can place the
common logic into a global procedure and invoke it when necessary.

This also lets us get rid of the ugly "|& cat" we were using before
as we can now rely on the Tcl 8.4 feature of "2>@1" or fallback to
the "|& cat" when necessary.

The post-commit hook is now run through the same API, but its outcome
does not influence the commit status.  As a result we now show any of
the errors from the post-commit hook in a dialog window, instead of on
the user's tty that was used to launch git-gui.  This resolves a long
standing bug related to not getting errors out of the post-commit hook
when launched under git-gui.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Correct window title for hook failure dialogs
Shawn O. Pearce [Sun, 20 Jan 2008 19:43:38 +0000 (14:43 -0500)]
git-gui: Correct window title for hook failure dialogs

During i18n translation work this message was partially broken
by using "append" instead of "strcat" to join the two different
parts of the message together.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Honor the standard commit-msg hook
Shawn O. Pearce [Sun, 20 Jan 2008 19:11:52 +0000 (14:11 -0500)]
git-gui: Honor the standard commit-msg hook

Under core Git the git-commit tool will invoke the commit-msg hook
if it exists and is executable to the user running git-commit.  As
a hook it has some limited value as it cannot alter the commit, but
it can modify the message the user is attempting to commit.  It is
also able to examine the message to ensure it conforms to some local
standards/conventions.

Since the hook takes the name of a temporary file holding the message
as its only parameter we need to move the code that creates the temp
file up earlier in our commit code path, and then pass through that
file name to the latest stage (where we call git-commit-tree).  We let
the hook alter the file as it sees fit and we don't bother to look at
its content again until the commit succeeded and we need the subject
for the reflog update.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoGIT 1.5.4-rc4 v1.5.4-rc4
Junio C Hamano [Mon, 21 Jan 2008 01:04:53 +0000 (17:04 -0800)]
GIT 1.5.4-rc4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Mon, 21 Jan 2008 00:58:38 +0000 (16:58 -0800)]
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Makefile - Handle $DESTDIR on Cygwin
  git-gui: add french glossary: glossary/fr.po
  git-gui: Refresh file status description after hunk application
  git-gui: Allow 'Create New Repository' on existing directories
  git-gui: Initial french translation
  git-gui: Improve German translation.
  git-gui: Updated Swedish translation after mailing list review.
  git-gui: Fix broken revert confirmation.
  git-gui: Update German translation
  git-gui: Update glossary: add term "hunk"

13 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Mon, 21 Jan 2008 00:57:56 +0000 (16:57 -0800)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: make Ctrl "+" really increase the font size

13 years agohttp-push and http-fetch: handle URLs without trailing /
Grégoire Barbier [Sat, 19 Jan 2008 15:22:50 +0000 (16:22 +0100)]
http-push and http-fetch: handle URLs without trailing /

The URL to a repository http-push and http-fetch takes should
have a trailing slash.  Instead of failing the request, add it
ourselves before attempting such a request.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohttp-push: clarify the reason of error from the initial PROPFIND request
Junio C Hamano [Sun, 20 Jan 2008 23:00:54 +0000 (15:00 -0800)]
http-push: clarify the reason of error from the initial PROPFIND request

The first thing http-push does is a PROPFIND to see if the other
end supports locking.  The failure message we give is always
reported as "no DAV locking support at the remote repository",
regardless of the reason why we ended up not finding the locking
support on the other end.

This moves the code to report "no DAV locking support" down the
codepath so that the message is issued only when we successfully
get a response to PROPFIND and the other end say it does not
support locking.  Other failures, such as connectivity glitches
and credential mismatches, have their own error message issued
and we will not issue "no DAV locking" error (we do not even
know if the remote end supports it).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohttp-push: fail when info/refs exists and is already locked
Grégoire Barbier [Sat, 19 Jan 2008 15:22:48 +0000 (16:22 +0100)]
http-push: fail when info/refs exists and is already locked

Failing instead of silently not updating remote refs makes the things
clearer for the user when trying to push on a repository while another
person do (or while a dandling locks are waiting for a 10 minutes
timeout).

When silently not updating remote refs, the user does not even know
that git has pushed the objects but leaved the refs as they were
before (e.g. a new bunch of commits on branch "master" is uploaded,
however the branch by itsel still points on the previous head commit).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohttp-push: fix webdav lock leak.
Grégoire Barbier [Sat, 19 Jan 2008 15:22:47 +0000 (16:22 +0100)]
http-push: fix webdav lock leak.

Releasing webdav lock even if push fails because of bad (or no)
reference on command line.

To reproduce the issue that this patch fixes, prepare a test repository
availlable over http+webdav, say at http://myhost/myrepo.git/

Then:

  $ git clone http://myhost/myrepo.git/
  $ cd myrepo
  $ git push http
  Fetching remote heads...
    refs/
    refs/heads/
    refs/tags/
  No refs in common and none specified; doing nothing.
  $ git push http
  Fetching remote heads...
    refs/
    refs/heads/
    refs/tags/
  No refs in common and none specified; doing nothing.
  $

Finally, you look at the web server logs, and will find one LOCK query
and no UNLOCK query, of course the second one will be in 423 return
code instead of 200:

1.2.3.4 - gb [19/Jan/2008:14:24:56 +0100] "LOCK /myrepo.git/info/refs HTTP/1.1" 200 465
(...)
1.2.3.4 - gb [19/Jan/2008:14:25:10 +0100] "LOCK /myrepo.git/info/refs HTTP/1.1" 423 363

With this patch, there would have be two UNLOCKs in addition of the LOCKs

From the user's point of view:

- If you realize that you should have typed e.g. "git push http
  master" instead of "git push http", you will have to wait for 10
  minutes for the lock to expire by its own.

- Furthermore, if somebody else is dumb enough to type "git push http"
  while you need to push "master" branch, then you'll need too to wait
  for 10 minutes too.

Signed-off-by: Gr\e.A\eNigoire Barbier <gb@gbarbier.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoparse_commit_buffer: tighten checks while parsing
Martin Koegler [Sat, 19 Jan 2008 17:35:23 +0000 (18:35 +0100)]
parse_commit_buffer: tighten checks while parsing

This tightens the parsing of a commit object in a couple of ways.

 - The "tree " header must end with a LF (earlier we did not
   check this condition).

 - Make sure parsing of timestamp on the "committer " header
   does not go beyond the buffer, even when (1) the "author "
   header does not end with a LF (this means that the commit
   object is malformed and lacks the committer information) or
   (2) the "committer " header does not have ">" that is the end
   of the e-mail address, or (3) the "committer " header does
   not end with a LF.

We however still keep the existing behaviour to return a parsed
commit object even when non-structural headers such as committer
and author are malformed, so that tools that need to look at
commits to clean up a history with such broken commits can still
get at the structural data (i.e. the parents chain and the tree
object).

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate git-completion for new 'remote rm' option
Dan McGee [Sun, 20 Jan 2008 06:54:57 +0000 (00:54 -0600)]
Update git-completion for new 'remote rm' option

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodoc typo: s/prior committing/prior to committing/
Jim Meyering [Sat, 19 Jan 2008 15:23:32 +0000 (16:23 +0100)]
doc typo: s/prior committing/prior to committing/

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>