git/git.git
13 years agogit-remote: reject adding remotes with invalid names
Jonas Fonseca [Sun, 13 Apr 2008 09:56:54 +0000 (11:56 +0200)]
git-remote: reject adding remotes with invalid names

This can happen if the arguments to git-remote add is switched by the
user, and git would only show an error if fetching was also requested.
Fix it by using the refspec parsing engine to check if the requested
name can be parsed as a remote before add it.

Also cleanup so that the "remote.<name>.url" config name buffer is only
initialized once.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint-1.5.4' into maint
Junio C Hamano [Thu, 17 Apr 2008 00:04:05 +0000 (17:04 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-am: minor cleanup
  Clarify and fix English in "git-rm" documentation

13 years agogit-am: minor cleanup
Junio C Hamano [Wed, 16 Apr 2008 23:46:26 +0000 (16:46 -0700)]
git-am: minor cleanup

This moves the assignment to FIRSTLINE down so that we do not have
to have multiple copies.

Suggested by Linus.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoClarify and fix English in "git-rm" documentation
Jon Loeliger [Wed, 16 Apr 2008 23:41:27 +0000 (18:41 -0500)]
Clarify and fix English in "git-rm" documentation

Do some verb-noun agreement changes.
Clarify some file globbing cases.
Fixed a wrong statement in an example.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint-1.5.4' into maint
Junio C Hamano [Wed, 16 Apr 2008 07:37:33 +0000 (00:37 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-bisect: make "start", "good" and "skip" succeed or fail atomically
  git-am: cope better with an empty Subject: line
  Ignore leading empty lines while summarizing merges
  bisect: squelch "fatal: ref HEAD not a symref" misleading message
  builtin-apply: Show a more descriptive error on failure when opening a patch
  Clarify documentation of git-cvsserver, particularly in relation to git-shell

13 years agogit-bisect: make "start", "good" and "skip" succeed or fail atomically
Christian Couder [Mon, 14 Apr 2008 03:41:45 +0000 (05:41 +0200)]
git-bisect: make "start", "good" and "skip" succeed or fail atomically

Before this patch, when "git bisect start", "git bisect good" or
"git bisect skip" were called with many revisions, they could fail
after having already marked some revisions as "good", "bad" or
"skip".

This could be especilally bad for "git bisect start" because as
the file ".git/BISECT_NAMES" would not have been written, there
would have been no attempt to clear the marked revisions on a
"git bisect reset". That's because if there is no
".git/BISECT_NAMES" file, nothing is done to clean things up, as
the bisect session is not supposed to have started.

While at it, let's also create the ".git/BISECT_START" file, only
after ".git/BISECT_NAMES" as been created.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-am: cope better with an empty Subject: line
Linus Torvalds [Tue, 15 Apr 2008 19:56:50 +0000 (12:56 -0700)]
git-am: cope better with an empty Subject: line

When the Subject: line is empty for whatever reason, git-am was fooled by
it and left an empty line at the beginning of the resulting commit log
message.

This moves the logic around so that we do not keep $SUBJECT in a separate
variable.  Instead, $dotest/msg-clean, which used to be the log message
body extracted from the message and then trailing whitespaces cleansed
out, now contains the subject line followed by a blank line at the
beginning for normal messages, and we use the first line from the file as
the summary line throughout the program.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoIgnore leading empty lines while summarizing merges
Linus Torvalds [Tue, 15 Apr 2008 18:01:36 +0000 (11:01 -0700)]
Ignore leading empty lines while summarizing merges

"git log" and friends normally skip the initial empty lines when showing
one-line summary of a commit, but merge summary didn't.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
 builtin-fmt-merge-msg.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobisect: squelch "fatal: ref HEAD not a symref" misleading message
Christian Couder [Wed, 16 Apr 2008 02:09:49 +0000 (04:09 +0200)]
bisect: squelch "fatal: ref HEAD not a symref" misleading message

To get the current HEAD when we start bisecting using for example
"git bisect start", we first try "git symbolic-ref HEAD" to get a
nice name, and if it fails, we fall back to "git rev-parse
--verify HEAD".

The problem is that when "git symbolic-ref HEAD" fails, it
displays "fatal: ref HEAD not a symref", so it looks like "git
bisect start" failed and does not accept detached HEAD, even if
in fact it worked fine.

This patch adds "-q" option to the "git symbolic-ref" call to
get rid of the misleading error message.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-apply: Show a more descriptive error on failure when opening a patch
Alberto Bertogli [Mon, 14 Apr 2008 15:30:27 +0000 (12:30 -0300)]
builtin-apply: Show a more descriptive error on failure when opening a patch

When a patch can't be opened (it doesn't exist, there are permission
problems, etc.) we get the usage text, which is not a proper indication of
failure.

Signed-off-by: Alberto Bertogli <albertito@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoClarify documentation of git-cvsserver, particularly in relation to git-shell
Scott Collins [Tue, 15 Apr 2008 21:44:43 +0000 (17:44 -0400)]
Clarify documentation of git-cvsserver, particularly in relation to git-shell

For SSH clients restricted to git-shell, CVS_SERVER does not have to be
specified, because git-shell understands the default value of 'cvs' to
mean git-cvsserver'. This makes it totally transparent to CVS users, but
the instruction to set up CVS access for people with real shell access
does not apply.

Previous wording mentioning GIT_AUTHOR, GIT_COMMITTER variables was
unclear that we really meant GIT_AUTHOR_(NAME|EMAIL), etc.

Note that the .ssh/environment file is a good place to set these, and that
the .bashrc is shell-specific. Add a bit of text to differentiate cvs -d
(setting CVSROOT) from cvs co -d (setting the name of the newly checked
out directory).  Removed an extra 'Example:' string.

Signed-off-by: Scott Collins <scc@ScottCollins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit clean: Add test to verify directories aren't removed with a prefix
Shawn Bohrer [Sun, 13 Apr 2008 23:49:38 +0000 (18:49 -0500)]
git clean: Add test to verify directories aren't removed with a prefix

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit clean: Don't automatically remove directories when run within subdirectory
Shawn Bohrer [Tue, 15 Apr 2008 03:14:09 +0000 (22:14 -0500)]
git clean: Don't automatically remove directories when run within subdirectory

When git clean is run from a subdirectory it should follow the normal
policy and only remove directories if they are passed in as a pathspec,
or -d is specified.

The fix is to send len which could be shorter than ent->len because we
have stripped the trailing '/' that read_directory adds. Additionaly
match_one() was modified to allow a name[] that is not NUL terminated.
This allows us to check if the name matched the pathspec exactly
instead of recursively.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule - possibly use branch name to describe a module
Mark Levedahl [Tue, 15 Apr 2008 02:48:06 +0000 (22:48 -0400)]
git-submodule - possibly use branch name to describe a module

This changes the search logic for describing a submodule from:
- annotated tag
- any tag
- tag on a subsequent commit
- commit id

to

- annotated tag
- any tag
- tag on a subsequent commit
- local or remote branch
- commit id

The change is describing with respect to a branch before falling
back to the commit id. By itself, git-submodule will maintain submodules
as headless checkouts without ever making a local branch. In
general, such heads can always be described relative to the remote branch
regardless of existence of tags, and so provides a better fallback
summary than just the commit id.

This requires inserting an extra describe step as --contains is
incompatible with --all, but the latter can be used with --always
to fall back to a commit ID. Also, --contains implies --tags, so the
latter is not needed.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot7401: squelch garbage output
Junio C Hamano [Sun, 13 Apr 2008 01:57:08 +0000 (18:57 -0700)]
t7401: squelch garbage output

The script had an unconditional output done outside of test_expect_*
construct, which leaked out and contaminated the output without -v.
Squelch it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation/git-submodule: typofix
Junio C Hamano [Sun, 13 Apr 2008 01:34:39 +0000 (18:34 -0700)]
Documentation/git-submodule: typofix

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix config key miscount in url.*.insteadOf
Daniel Barkalow [Sat, 12 Apr 2008 19:32:00 +0000 (15:32 -0400)]
Fix config key miscount in url.*.insteadOf

Also tighten test to require it to be correct.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint-1.5.4' into maint
Junio C Hamano [Sat, 12 Apr 2008 22:41:19 +0000 (15:41 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
  Document -w option to shortlog
  bisect: report bad rev better

13 years agoDocs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Clifford Caoile [Sat, 12 Apr 2008 09:50:20 +0000 (18:50 +0900)]
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)

gitk creates and uses ~/.gitk

Signed-off-by: Clifford Caoile <piyo@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocument -w option to shortlog
Junio C Hamano [Sat, 12 Apr 2008 22:38:20 +0000 (15:38 -0700)]
Document -w option to shortlog

Noticed by Fredrik Noring.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobisect: report bad rev better
Christian Couder [Sat, 12 Apr 2008 09:17:36 +0000 (02:17 -0700)]
bisect: report bad rev better

The previous one overwrote the variable used to report the bad input
when the input is actually bad, and we did not give a useful enough
information.  This corrects it.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint-1.5.4' into maint
Junio C Hamano [Sat, 12 Apr 2008 06:55:55 +0000 (23:55 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  bisect: fix bad rev checking in "git bisect good"
  revision.c: make --date-order overriddable
  Fix section about backdating tags in the git-tag docs
  Document option --only of git commit
  Documentation/git-request-pull: Fixed a typo ("send" -> "end")

13 years agobisect: fix bad rev checking in "git bisect good"
Christian Couder [Sat, 12 Apr 2008 05:53:59 +0000 (07:53 +0200)]
bisect: fix bad rev checking in "git bisect good"

It seems that "git bisect good" and "git bisect skip" have never
properly checked arguments that have been passed to them. As soon
as one of them can be parsed as a SHA1, no error or warning would
be given.

This is because 'git rev-parse --revs-only --no-flags "$@"' always
"exit 0" and outputs all the SHA1 it can found from parsing "$@".

This patch fix this by using, for each "bisect good" argument, the
same logic as for the "bisect bad" argument.

While at it, this patch teaches "bisect bad" to give a meaningfull
error message when it is passed more than one argument.

Note that if "git bisect good" or "git bisect skip" is given some
proper revs and then something that is not a proper rev, then the
first proper revs will still have been marked as "good" or "skip".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agorevision.c: make --date-order overriddable
Michele Ballabio [Thu, 10 Apr 2008 20:06:52 +0000 (22:06 +0200)]
revision.c: make --date-order overriddable

Jan Engelhardt noticed that while --topo-order can be overridden by a
subsequent --date-order, the reverse was not possible. That's because
setup_revisions() failed to set revs->lifo properly.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: Avoid 'fatal: cannot describe' message
Ping Yin [Thu, 10 Apr 2008 14:45:29 +0000 (22:45 +0800)]
git-submodule: Avoid 'fatal: cannot describe' message

When "git submodule status" command tries to show the name of the
submodule HEAD revision more descriptively, but the submodule
repository lacked a suitable tag to do so, it leaked "fatal: cannot
describe" message to the UI.  Squelch it by using '--always'.

Signed-off-by: Ping Yin <pkufranky@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoForce the medium pretty format on calls to git log
Pedro Melo [Thu, 10 Apr 2008 16:05:21 +0000 (17:05 +0100)]
Force the medium pretty format on calls to git log

If a user has customized format.pretty in config, git-svn rebase fails with:

Unable to determine upstream SVN information from working tree history

because the command expects to read the commit log in the default format.

This fixes the command to explicitly ask for the format it wants to read
from.

Signed-off-by: Pedro Melo <melo@simplicidade.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix section about backdating tags in the git-tag docs
Björn Steinbrink [Fri, 11 Apr 2008 20:52:07 +0000 (22:52 +0200)]
Fix section about backdating tags in the git-tag docs

The tagger is equal to the committer, not the author, so
GIT_COMMITTER_DATE is the right environment variable to use, not
GIT_AUTHOR_DATE.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocument option --only of git commit
Johannes Sixt [Thu, 10 Apr 2008 11:33:09 +0000 (13:33 +0200)]
Document option --only of git commit

Its documentation was removed by 6c96753 (Documentation/git-commit: rewrite
to make it more end-user friendly, 2006-12-08), even though it is referenced
from a few places, including builtin-commit.c (as part of the commentary in
the commit message template).

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation/git-request-pull: Fixed a typo ("send" -> "end")
Dirk Suesserott [Wed, 9 Apr 2008 20:20:10 +0000 (22:20 +0200)]
Documentation/git-request-pull: Fixed a typo ("send" -> "end")

Signed-off-by: Dirk Suesserott <newsletter@dirk.my1.cc>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-fetch: fix status output when not storing tracking ref
Jeff King [Thu, 10 Apr 2008 00:03:49 +0000 (20:03 -0400)]
git-fetch: fix status output when not storing tracking ref

There was code in update_local_ref for handling this case,
but it never actually got called. It assumed that storing in
FETCH_HEAD meant a blank peer_ref name, but we actually have
a NULL peer_ref in this case, so we never even made it to
the update_local_ref function.

On top of that, the display formatting was different from
all of the other cases, probably owing to the fact that
nobody had ever actually seen the output.

This patch harmonizes the output with the other cases and
moves the detection of this case into store_updated_refs,
where we can actually trigger it.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint-1.5.4' into maint
Junio C Hamano [Thu, 10 Apr 2008 07:29:33 +0000 (00:29 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  core-tutorial.txt: Fix showing the current behaviour.
  git-archive: ignore prefix when checking file attribute
  Fix documentation syntax of optional arguments in short options.

13 years agocore-tutorial.txt: Fix showing the current behaviour.
Carlos Rica [Thu, 10 Apr 2008 00:08:23 +0000 (02:08 +0200)]
core-tutorial.txt: Fix showing the current behaviour.

The --root option from "git diff-tree" won't do nothing
when is given to commands like git-whatchanged or git-log,
because those always print the initial commit by default.

This fixes the tutorial explaining the function of the
log.showroot configuration variable.

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-archive: ignore prefix when checking file attribute
René Scharfe [Wed, 9 Apr 2008 21:14:43 +0000 (23:14 +0200)]
git-archive: ignore prefix when checking file attribute

Ulrik Sverdrup noticed that git-archive doesn't correctly apply the attribute
export-subst when the option --prefix is given, too.

When it checked if a file has the attribute turned on, git-archive would try
to look up the full path -- including the prefix -- in .gitattributes.  That's
wrong, as the prefix doesn't need to have any relation to any existing
directories, tracked or not.

This patch makes git-archive ignore the prefix when looking up if value of the
attribute export-subst for a file.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix documentation syntax of optional arguments in short options.
Carlos Rica [Wed, 9 Apr 2008 11:07:14 +0000 (13:07 +0200)]
Fix documentation syntax of optional arguments in short options.

When an argument for an option is optional, like in -n from git-tag,
puting a space between the option and the argument is interpreted
as a missing argument for the option plus an isolated argument.
Documentation now reflects the need to write the parameter following
the option -n, as in "git tag -nARG", for instance.

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.5 v1.5.5
Junio C Hamano [Tue, 8 Apr 2008 04:57:43 +0000 (21:57 -0700)]
GIT 1.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Tue, 8 Apr 2008 04:52:23 +0000 (21:52 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix changing colors through Edit->Preferences

13 years agogit-svn: fix following renamed paths when tracking a single path
Eric Wong [Mon, 7 Apr 2008 07:08:03 +0000 (00:08 -0700)]
git-svn: fix following renamed paths when tracking a single path

When using git-svn to follow only a single (empty) path per
svn-remote (i.e. not using --stdlayout), following the history
of a renamed path was broken in
c586879cdfa4f8181a14e953a9152a4639eef333.

This reverts the regression for the single (emtpy) path per
svn-remote case.

To avoid breaking the tests in a committed revision, this is an
addendum to a patch originally submitted by

  Santhosh Kumar Mani <santhoshmani@gmail.com>:
  > git-svn: add test for renamed directory fetch
  >
  > This test tries to fetch a directory which had renames in the
  > history from a SVN repository.

  [ew: unneccesary dependency on the starting an HTTP server
   removed from Santhosh's original test.]

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jc/maint-apply-match-beginning'
Junio C Hamano [Mon, 7 Apr 2008 03:04:29 +0000 (20:04 -0700)]
Merge branch 'jc/maint-apply-match-beginning'

* jc/maint-apply-match-beginning:
  Fix "git apply" to correctly enforce "match at the beginning"

13 years agoAdd prefix oriented completions for diff and format-patch commands.
Pascal Obry [Sun, 6 Apr 2008 16:56:08 +0000 (18:56 +0200)]
Add prefix oriented completions for diff and format-patch commands.

Signed-off-by: Pascal Obry <pascal@obry.net>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agotest suite: remove useless TERM cruft in "t7005-editor.sh"
Christian Couder [Sun, 6 Apr 2008 17:08:50 +0000 (19:08 +0200)]
test suite: remove useless TERM cruft in "t7005-editor.sh"

In commit 15387e3 (Test suite: reset TERM to its previous value after
testing., 2007-10-26), I added a workaround to reset TERM to its previous
value before the "test_done" at the end of "t7005-editor.sh" because
otherwise "test_done" would have printed the test result with a bad TERM
env variable (this resulted in output with no color on konsole).

But since commit c2116a1 (test-lib: fix TERM to dumb for test
repeatability, 2008-03-06), colored output is printed in a subshell with
TERM reset to its original value so the earlier workaround is not needed
anymore.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd interactive option in rebase command completion list.
Pascal Obry [Sun, 6 Apr 2008 17:32:24 +0000 (19:32 +0200)]
Add interactive option in rebase command completion list.

Signed-off-by: Pascal Obry <pascal@obry.net>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix "git apply" to correctly enforce "match at the beginning"
Junio C Hamano [Mon, 7 Apr 2008 02:21:45 +0000 (19:21 -0700)]
Fix "git apply" to correctly enforce "match at the beginning"

An earlier commit 4be6096 (apply --unidiff-zero: loosen sanity checks for
--unidiff=0 patches, 2006-09-17) made match_beginning and match_end
computed incorrectly.  If a hunk inserts at the beginning, old position
recorded at the hunk is line 0, and if a hunk changes at the beginning, it
is line 1.  The new test added to t4104 exposes that the old code did not
insist on matching at the beginning for a patch to add a line to an empty
file.

An even older 65aadb9 (apply: force matching at the beginning.,
2006-05-24) was equally wrong in that it tried to take hints from the
number of leading context lines, to decide if the hunk must match at the
beginning, but we can just look at the line number in the hunk to decide.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd description of OFS_DELTA to the pack format description
Peter Eriksen [Sun, 6 Apr 2008 20:51:49 +0000 (22:51 +0200)]
Add description of OFS_DELTA to the pack format description

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogitk: Fix changing colors through Edit->Preferences
Gerrit Pape [Wed, 26 Mar 2008 18:45:26 +0000 (18:45 +0000)]
gitk: Fix changing colors through Edit->Preferences

With tcl/tk8.5 the lset command seems to behave differently.  When
changing the background color through Edit->Preferences, the changes
are applied, but new dialogs, such as View->New view... barf with

 Error: unknown color name "{#ffffff}"

Additionally when closing gitk, and starting it up again, a bad value
has been saved to ~/.gitk, preventing gitk from running properly; it
fails with

 Error in startup script: unknown color name "{#ffffff}"
 ...

This commit fixes the problem by changing the color dialogs to pass
the empty string {} as the list index to choosecolor.  This causes
the lset and lindex commands used by choosecolor to use and set the
whole variable (bgcolor, fgcolor or selectbgcolor) rather than
treating them as a 1-element list.  Tested with tcl/tk8.4 and 8.5.

Dmitry Potapov reported this problem through
 http://bugs.debian.org/472615

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
13 years agogit-pack-objects.txt: Make wording slightly less ambiguous
Peter Eriksen [Sat, 5 Apr 2008 19:46:49 +0000 (21:46 +0200)]
git-pack-objects.txt: Make wording slightly less ambiguous

It is a bit confusing on first read, that

        "The packed archive format (.pack) is designed
        to be unpackable..."

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-fetch: Don't trigger a bus error when given the refspec "tag"
Kevin Ballard [Sat, 5 Apr 2008 18:28:53 +0000 (14:28 -0400)]
git-fetch: Don't trigger a bus error when given the refspec "tag"

When git-fetch encounters the refspec "tag" it assumes that the next
argument will be a tag name. If there is no next argument, it should
die gracefully instead of erroring.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoRevert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
Jakub Narebski [Sat, 5 Apr 2008 20:13:24 +0000 (21:13 +0100)]
Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"

This reverts commit 6aa6f92fda47cc4ee5f599895e8a5a327fb6f9ab.

It caused is_deleted() subroutine to output warnings when dealing with
old, legacy gitweb blobdiff URLs without either 'hb' or 'hpb'
parameters.

This fixes http://bugs.debian.org/469083

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Sat, 5 Apr 2008 05:38:32 +0000 (22:38 -0700)]
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: use +/- instead of ]/[ to show more/less context in diff
  git-gui: Update french translation
  git-gui: Switch keybindings for [ and ] to bracketleft and bracketright

13 years agogit-gui: use +/- instead of ]/[ to show more/less context in diff gitgui-0.10.1
Michele Ballabio [Fri, 4 Apr 2008 21:04:42 +0000 (23:04 +0200)]
git-gui: use +/- instead of ]/[ to show more/less context in diff

On some systems, brackets cannot be used as event details
(they don't have a keysym), so use +/- instead (both on
keyboard and keypad) and add ctrl-= as a synonym of ctrl-+
for convenience.

[sp: Had to change accelerator to show only "$M1T-="; the
     original version included "$M1T-+ $M1T-=" but this is
 not drawn at all on Mac OS X.]

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Update french translation
Christian Couder [Sat, 5 Apr 2008 02:20:23 +0000 (04:20 +0200)]
git-gui: Update french translation

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Switch keybindings for [ and ] to bracketleft and bracketright
Shawn O. Pearce [Thu, 3 Apr 2008 22:06:29 +0000 (18:06 -0400)]
git-gui: Switch keybindings for [ and ] to bracketleft and bracketright

Thanks to Michele Ballabio for the quick fix.
This resolves the error introduced by c91ee2bd61.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoGIT 1.5.5-rc3 v1.5.5-rc3
Junio C Hamano [Wed, 2 Apr 2008 17:42:14 +0000 (10:42 -0700)]
GIT 1.5.5-rc3

The rate of fixes that trickle in has slowed and we are definitely
getting there.  Hopefully one final round and we will have the final
1.5.5 soon.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'js/filter-branch'
Junio C Hamano [Wed, 2 Apr 2008 18:13:23 +0000 (11:13 -0700)]
Merge branch 'js/filter-branch'

* js/filter-branch:
  filter-branch: Fix renaming a directory in the tree-filter
  filter-branch: Test renaming directories in a tree-filter

13 years agoDescribe the bug in handling filenames with funny characters in 'git add -i'
Teemu Likonen [Wed, 2 Apr 2008 17:06:46 +0000 (20:06 +0300)]
Describe the bug in handling filenames with funny characters in 'git add -i'

The interactive mode does not work with files whose names contain
characters that need C-quoting.  `core.quotepath` configuration can be
used to work this limitation around to some degree, but backslash,
double-quote and control characters will still have problems.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Wed, 2 Apr 2008 17:29:10 +0000 (10:29 -0700)]
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui 0.10
  git-gui: Add shortcut keys for Show More/Less Context

13 years agoMerge branch 'bc/mktag'
Junio C Hamano [Wed, 2 Apr 2008 07:23:19 +0000 (00:23 -0700)]
Merge branch 'bc/mktag'

* bc/mktag:
  mktag.c: tweak validation of tagger field and adjust test script
  mktag.c: improve verification of tagger field and tests

13 years agoMerge branch 'pb/cvsserver'
Junio C Hamano [Wed, 2 Apr 2008 07:22:20 +0000 (00:22 -0700)]
Merge branch 'pb/cvsserver'

* pb/cvsserver:
  git-cvsserver: handle change type T

13 years agoMerge branch 'dd/cvsserver'
Junio C Hamano [Wed, 2 Apr 2008 07:22:15 +0000 (00:22 -0700)]
Merge branch 'dd/cvsserver'

* dd/cvsserver:
  cvsserver: Use the user part of the email in log and annotate results
  cvsserver: Add test for update -p
  cvsserver: Implement update -p (print to stdout)
  cvsserver: Add a few tests for 'status' command
  cvsserver: Do not include status output for subdirectories if -l is passed
  cvsserver: Only print the file part of the filename in status header
  cvsserver: Respond to the 'editors' and 'watchers' commands

13 years agoMerge branch 'je/cvsserver'
Junio C Hamano [Wed, 2 Apr 2008 07:22:06 +0000 (00:22 -0700)]
Merge branch 'je/cvsserver'

* je/cvsserver:
  Allow git-cvsserver database table name prefix to be specified.

13 years agot7004-tag: Skip more tests if gpg is not available.
Johannes Sixt [Wed, 2 Apr 2008 06:52:37 +0000 (08:52 +0200)]
t7004-tag: Skip more tests if gpg is not available.

This test was already careful enough to skip signed tag tests if gpg
is not available, but it must also skip all verify tests, even those
that are about non-signed tags, because they also invoke gpg.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoverify-tag: Clean up the temporary file if gpg cannot be started.
Johannes Sixt [Wed, 2 Apr 2008 06:49:59 +0000 (08:49 +0200)]
verify-tag: Clean up the temporary file if gpg cannot be started.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agohelp: Add a missing OPT_END().
Christian Couder [Wed, 2 Apr 2008 03:47:41 +0000 (05:47 +0200)]
help: Add a missing OPT_END().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAccept git aliases outside a git repository
Junio C Hamano [Tue, 1 Apr 2008 04:33:09 +0000 (21:33 -0700)]
Accept git aliases outside a git repository

af05d67 (Always set *nongit_ok in setup_git_directory_gently(),
2008-03-25) had a change from the patch originally submitted that resulted
in disabling aliases outside a git repository.

It turns out that some people used "alias.fubar = diff --color-words" in
$HOME/.gitconfig to use non-index diff (or any command that do not need
git repository) outside git repositories, and this change broke them,
so this resurrects the support for such usage.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-gui 0.10 gitgui-0.10.0
Shawn O. Pearce [Wed, 2 Apr 2008 06:17:11 +0000 (02:17 -0400)]
git-gui 0.10

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gui: Add shortcut keys for Show More/Less Context
Jonathan del Strother [Tue, 1 Apr 2008 10:54:03 +0000 (11:54 +0100)]
git-gui: Add shortcut keys for Show More/Less Context

Bound to Ctrl/Cmd + left & right square brackets, depending on
your platform.

[sp: Added missing binds for . to allow shortcuts to work when
     not focused in the commit message area.]

Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agomktag.c: tweak validation of tagger field and adjust test script
Brandon Casey [Mon, 31 Mar 2008 23:25:23 +0000 (18:25 -0500)]
mktag.c: tweak validation of tagger field and adjust test script

Update the verify_tag() function to remove an unnecessary test, and add
additional check for angle brackets in the name and email field, and
spaces in the email field. The timestamp and timezone sections are made
more straight forward by using strspn().

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: Fix renaming a directory in the tree-filter
veillette@yahoo.ca [Mon, 31 Mar 2008 07:14:15 +0000 (09:14 +0200)]
filter-branch: Fix renaming a directory in the tree-filter

Commit d89c1df (filter-branch: don't use xargs -0, 2008-03-12) replaced a
'ls-files | xargs rm' pipeline by 'git clean'. 'git clean' however does
not recurse and remove directories by default.

Now, consider a tree-filter that renames a directory.

  1. For the first commit everything works as expected

  2. Then filter-branch checks out the files for the next commit. This
     leaves the new directory behind because there is no real "branch
     switching" involved that would notice that the directory can be
     removed.

  3. Then filter-branch invokes 'git clean' to remove exactly those
     left-overs. But here it does not remove the directory.

  4. The next tree-filter does not work as expected because there already
     exists a directory with the new name.

Just add -d to 'git clean', so that empty directories are removed.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: Test renaming directories in a tree-filter
Johannes Sixt [Mon, 31 Mar 2008 07:14:14 +0000 (09:14 +0200)]
filter-branch: Test renaming directories in a tree-filter

This test currently fails.

If b is a directory then 'mv a b' is not a plain "rename", but really a
"move", so we must also test that the directory does not exist with the
old name in the directory with the new name.

There's also some cleanup in the corresponding "rename file" test to avoid
spurious shell syntax errors and "ambigous ref" error from 'git show' (but
these should show up only if the test would fail anyway). Plus we also
test for the non-existence of the old file.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
13 years agomktag.c: improve verification of tagger field and tests
Brandon Casey [Thu, 27 Mar 2008 16:16:04 +0000 (11:16 -0500)]
mktag.c: improve verification of tagger field and tests

Since nearly its birth, git's tags have included a "tagger" field which
describes the name of tagger, email of tagger, and date and time of tagging.
But, this field was only loosely tested by git-mktag. Provide some thorough
testing for this field and also ensure that the tag header is separated
from the tag body by an empty line to reduce the convenience of creating
a flawed tag.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodiff-files: careful when inspecting work tree items
Junio C Hamano [Mon, 31 Mar 2008 00:30:08 +0000 (17:30 -0700)]
diff-files: careful when inspecting work tree items

This fixes the same breakage in diff-files.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodiff-index: careful when inspecting work tree items
Junio C Hamano [Mon, 31 Mar 2008 00:29:48 +0000 (17:29 -0700)]
diff-index: careful when inspecting work tree items

Earlier, if you changed a staged path into a directory in the work tree,
we happily ran lstat(2) on it and found that it exists, and declared that
the user changed it to a gitlink.

This is wrong for two reasons:

 (1) It may be a directory, but it may not be a submodule, and in the
     latter case, the change we need to report is "the blob at the path
     has disappeared".  We need to check with resolve_gitlink_ref() to be
     consistent with what "git add" and "git update-index --add" does.

 (2) lstat(2) may have succeeded only because a leading component of the
     path was turned into a symbolic link that points at something that
     exists in the work tree.  In such a case, the path itself does not
     exist anymore, as far as the index is concerned.

This fixes these breakages in diff-index that the previous patch has
exposed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd corner case tests for diff-index and diff-files
Junio C Hamano [Mon, 31 Mar 2008 00:28:05 +0000 (17:28 -0700)]
Add corner case tests for diff-index and diff-files

diff-index and diff-files can get confused in corner cases when an indexed
blob turns into something else in the work tree.  This patch adds tests to
expose such breakages.

The test is classified under t2XXX series instead of t4XXX series, because
the ultimate objective is to fix "add -u" (and "commit -a" that shares the
same issue).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAllow git-cvsserver database table name prefix to be specified.
Josh Elsasser [Thu, 27 Mar 2008 21:02:14 +0000 (14:02 -0700)]
Allow git-cvsserver database table name prefix to be specified.

Adds a gitcvs.dbtablenameprefix config variable, the contents of which
are prepended to any database tables names used by git-cvsserver. The
same substutions as gitcvs.dbname and gitcvs.dbuser are supported, and
any non-alphabetic characters are replaced with underscores.

A typo found in contrib/completion/git-completion.bash is also fixed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoSilence cpio's "N blocks" output when cloning locally
Bryan Donlan [Fri, 28 Mar 2008 06:19:46 +0000 (02:19 -0400)]
Silence cpio's "N blocks" output when cloning locally

Pass --quiet to cpio in git-clone to hide the (confusing) "0 blocks" message.
For compatibility with operating systems which might not support GNUisms,
the presence of --quiet is probed for by grepping cpio's --help output.

Signed-off-by: Bryan Donlan <bdonlan@fushizen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-svn: remove redundant slashes from show-ignore
Eric Wong [Sat, 29 Mar 2008 23:37:17 +0000 (16:37 -0700)]
git-svn: remove redundant slashes from show-ignore

Jonathan Scott Duff wrote:

> Recently I tried "git svn showignore" on my parrot repository and it
> failed.  I tracked it down to the prop_walk() sub.  When it recurses,
> $path has an extra / on the beginning (i.e., when it recurses, it
> tries to get the props for "//apps" instead of "/apps").   I *think*
> this is because $path is used in the recursive call rather than $p
> (which seems to contain a properly transformed $path).  Anyway, I've
> attached a patch that works for me and I think is generally the right
> thing.

Patch-submitted-by: Jonathan Scott Duff
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
Marius Storm-Olsen [Fri, 28 Mar 2008 14:40:40 +0000 (15:40 +0100)]
git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.

git-p4s handling of Windows style EOL was broken after the removal
of the p4 submit template handling in commit f2a6059. Fix that, and
make getP4OpenedType() more robust.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
13 years agogit-cvsserver: handle change type T
Paolo Bonzini [Sun, 16 Mar 2008 19:00:21 +0000 (20:00 +0100)]
git-cvsserver: handle change type T

git-cvsserver does not support changes of type T (file type change,
e.g. symlink->real file).  This patch treats them the same as changes
of type M.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.5-rc2 v1.5.5-rc2
Junio C Hamano [Fri, 28 Mar 2008 03:43:51 +0000 (20:43 -0700)]
GIT 1.5.5-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.4.5 v1.5.4.5
Junio C Hamano [Fri, 28 Mar 2008 03:36:35 +0000 (20:36 -0700)]
GIT 1.5.4.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Use the user part of the email in log and annotate results
Damien Diederen [Thu, 27 Mar 2008 22:18:35 +0000 (23:18 +0100)]
cvsserver: Use the user part of the email in log and annotate results

Generate the CVS author names by taking the first eight characters of
the user part of the email address.  The resulting names are more
likely to make sense (or at least reduce ambiguities) in "corporate"
environments.

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Add test for update -p
Damien Diederen [Thu, 27 Mar 2008 22:18:23 +0000 (23:18 +0100)]
cvsserver: Add test for update -p

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Implement update -p (print to stdout)
Damien Diederen [Thu, 27 Mar 2008 22:18:12 +0000 (23:18 +0100)]
cvsserver: Implement update -p (print to stdout)

Cvs update -p -r <rev> <path> is the documented way to retrieve a
specific revision of a file (similar to git show <rev>:<path>).
Without this patch, the -p flag is ignored and status output is
produced, causing clients to interpret it as the contents of the file.

TkCVS uses update -p as a basis for implementing its various "View"
and "Diff" commands.

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Add a few tests for 'status' command
Damien Diederen [Thu, 27 Mar 2008 22:18:02 +0000 (23:18 +0100)]
cvsserver: Add a few tests for 'status' command

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Do not include status output for subdirectories if -l is passed
Damien Diederen [Thu, 27 Mar 2008 22:17:53 +0000 (23:17 +0100)]
cvsserver: Do not include status output for subdirectories if -l is passed

This effectively implements the -l switch by pruning the entries whose
filenames contain a path separator.  It was previously ignored.

Without this, TkCVS includes strange "ghost" entries in its directory
listings.

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Only print the file part of the filename in status header
Damien Diederen [Thu, 27 Mar 2008 22:17:42 +0000 (23:17 +0100)]
cvsserver: Only print the file part of the filename in status header

The "File:" header of CVS status output only includes the basename of
the file, even when generating a recursive listing; do the same.

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: Respond to the 'editors' and 'watchers' commands
Damien Diederen [Thu, 27 Mar 2008 22:17:26 +0000 (23:17 +0100)]
cvsserver: Respond to the 'editors' and 'watchers' commands

These commands list users editing and watching locked files.  This trivial
implementation always returns an empty response, since git-cvsserver does not
implement file locking.

Without this, TkCVS hangs at startup, waiting forever for a response.

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-prune: protect objects listed on the command line
Junio C Hamano [Tue, 25 Mar 2008 06:20:51 +0000 (23:20 -0700)]
builtin-prune: protect objects listed on the command line

Finally, this resurrects the documented behaviour to protect other
objects listed on the command line from getting pruned.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-prune.c: use parse_options()
Michele Ballabio [Sun, 23 Mar 2008 20:50:29 +0000 (21:50 +0100)]
builtin-prune.c: use parse_options()

Using the OPT_DATE() introduced earlier, this updates builtin-prune to
use parse_options().

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd tests for git-prune
Michele Ballabio [Sun, 23 Mar 2008 21:34:34 +0000 (22:34 +0100)]
Add tests for git-prune

It seems that git prune changed behaviour with respect to revisions added
from command line, probably when it became a builtin. Currently, it prints
a short usage and exits: instead, it should take those revisions into
account and not prune them. So add a couple of test to point this out.

We'll be fixing this by switching to parse_options(), so add tests to
detect bogus command line parameters as well, to keep ourselves from
introducing regressions.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoparse-options.c: introduce OPT_DATE
Michele Ballabio [Mon, 24 Mar 2008 14:02:21 +0000 (15:02 +0100)]
parse-options.c: introduce OPT_DATE

There are quite a few places that will need to call approxidate(),
when they'll adopt the parse-options system, so this patch adds the
function parse_opt_approxidate_cb(), used by OPT_DATE.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate draft release notes for 1.5.5
Junio C Hamano [Thu, 27 Mar 2008 20:37:29 +0000 (13:37 -0700)]
Update draft release notes for 1.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint'
Junio C Hamano [Thu, 27 Mar 2008 20:35:18 +0000 (13:35 -0700)]
Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.4.5
  Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
  t/t3800-mktag.sh: use test_must_fail rather than '!'

Conflicts:

t/t3800-mktag.sh

13 years agoUpdate draft release notes for 1.5.4.5
Junio C Hamano [Thu, 27 Mar 2008 20:14:20 +0000 (13:14 -0700)]
Update draft release notes for 1.5.4.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jc/maint-fetch-regression-1.5.4' into maint
Junio C Hamano [Thu, 27 Mar 2008 20:03:56 +0000 (13:03 -0700)]
Merge branch 'jc/maint-fetch-regression-1.5.4' into maint

* jc/maint-fetch-regression-1.5.4:
  git-fetch test: test tracking fetch results, not just FETCH_HEAD
  Fix branches file configuration
  Tighten refspec processing

13 years agoDocumentation: clarify use of .git{ignore,attributes} versus .git/info/*
Jeff King [Thu, 27 Mar 2008 05:31:00 +0000 (01:31 -0400)]
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*

gitignore patterns can be read from three different
files, while gitattributes can come from two files. Let's
provide some hints to the user about the differences and how
they are typically used.

Suggested by Toby Corkindale, but gratuitously reworded by Jeff King.

Signed-off-by: Toby Corkindale <toby.corkindale@rea-group.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agotest_must_fail: 129 is a valid error code from usage()
Junio C Hamano [Tue, 25 Mar 2008 06:07:08 +0000 (23:07 -0700)]
test_must_fail: 129 is a valid error code from usage()

When a git command is run under test_must_fail to make sure that
the argument parser catches bogus command line, it exits with 129.
We need to catch it as a valid "graceful error exit".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoimap-send: properly error out if imap.host is not set in config
Gerrit Pape [Wed, 26 Mar 2008 18:05:17 +0000 (18:05 +0000)]
imap-send: properly error out if imap.host is not set in config

If no imap host is specified in the git config, git imap-send used
to try to lookup a null pointer through gethostbyname(), causing a
segfault.  Since setting the imap.host variable is mandatory,
imap-send now properly fails with an explanatory error message.

The problem has been reported by picca through
 http://bugs.debian.org/472632

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot9600-cvsimport.sh: set HOME before checking for cvsps availability
Frank Lichtenheld [Wed, 26 Mar 2008 17:34:20 +0000 (17:34 +0000)]
t9600-cvsimport.sh: set HOME before checking for cvsps availability

This actually sounds like a bug in cvsps, which requires an existing
home directory when asked for the usage through -h

 $ HOME=/nonexistent cvsps -h
 Cannot create the cvsps directory '.cvsps': No such file or directory

This made t9600 think that cvsps is not available if HOME did not exist,
causing the tests to be skipped

 $ HOME=/nonexistent sh t9600-cvsimport.sh
 * skipping cvsimport tests, cvsps not found
 * passed all 0 test(s)

Now t9600 sets HOME to the current working directory before checking for
the availability of the cvsps program.

This issue has been discovered by Marco Rodrigues, and fixed by Frank
Lichtenheld through
 http://bugs.debian.org/471969

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAlways set *nongit_ok in setup_git_directory_gently()
SZEDER Gábor [Tue, 25 Mar 2008 21:06:26 +0000 (22:06 +0100)]
Always set *nongit_ok in setup_git_directory_gently()

setup_git_directory_gently() only modified the value of its *nongit_ok
argument if we were not in a git repository.  Now it will always set it
to 0 when we are inside a repository.

Also remove now unnecessary initializations in the callers of this
function.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot/t3800-mktag.sh: use test_must_fail rather than '!'
Brandon Casey [Wed, 26 Mar 2008 00:20:52 +0000 (19:20 -0500)]
t/t3800-mktag.sh: use test_must_fail rather than '!'

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