git/git.git
13 years agoMerge branch 'jc/diff-mark'
Junio C Hamano [Sat, 7 Jul 2007 20:37:32 +0000 (13:37 -0700)]
Merge branch 'jc/diff-mark'

* jc/diff-mark:
  diff: honor binariness specified in attributes
  Fix configuration syntax to specify customized hunk header patterns.
  Per-path attribute based hunk header selection.
  Future-proof source for changes in xdemitconf_t
  Introduce diff_filespec_is_binary()

13 years agoMerge branch 'maint'
Junio C Hamano [Sat, 7 Jul 2007 19:29:09 +0000 (12:29 -0700)]
Merge branch 'maint'

* maint:
  Fix "apply --reverse" with regard to whitespace

13 years agodiff: honor binariness specified in attributes
Junio C Hamano [Sat, 7 Jul 2007 19:25:11 +0000 (12:25 -0700)]
diff: honor binariness specified in attributes

The code shuffling mistakenly lost binariness specified with the
attribute mecahnism and made it always guess from the data.

Noticed by Johannes, with two test cases to t4020.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix "apply --reverse" with regard to whitespace
Johannes Schindelin [Sat, 7 Jul 2007 17:50:39 +0000 (18:50 +0100)]
Fix "apply --reverse" with regard to whitespace

"git apply" used to take check the whitespace in the wrong
direction.

Noticed by Daniel Barkalow.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodiff-lib.c: don't strdup twice
René Scharfe [Sat, 7 Jul 2007 18:19:08 +0000 (20:19 +0200)]
diff-lib.c: don't strdup twice

The static function read_directory in diff-lib.c is only ever called
with struct path_list lists with .strdup_paths turned on, i.e.
path_list_insert will strdup the paths for us (again).  Let's take
advantage of that and stop doing it twice.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix configuration syntax to specify customized hunk header patterns.
Junio C Hamano [Sat, 7 Jul 2007 08:49:58 +0000 (01:49 -0700)]
Fix configuration syntax to specify customized hunk header patterns.

This updates the hunk header customization syntax.  The special
case 'funcname' attribute is gone.

You assign the name of the type of contents to path's "diff"
attribute as a string value in .gitattributes like this:

*.java diff=java
*.perl diff=perl
*.doc diff=doc

If you supply "diff.<name>.funcname" variable via the
configuration mechanism (e.g. in $HOME/.gitconfig), the value is
used as the regexp set to find the line to use for the hunk
header (the variable is called "funcname" because such a line
typically is the one that has the name of the function in
programming language source text).

If there is no such configuration, built-in default is used, if
any.  Currently there are two default patterns: default and java.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-branch: default to --track
Johannes Schindelin [Fri, 6 Jul 2007 21:54:09 +0000 (22:54 +0100)]
git-branch: default to --track

"git branch --track" will setup config variables when branching from
a remote branch, so that if you say "git pull" while being on that
branch, it automatically fetches the correct remote, and merges the
correct branch.

Often people complain that this is not the default for "git branch".
Make it so.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-send-email: allow an email alias for --from
Michael Hendricks [Thu, 5 Jul 2007 01:11:36 +0000 (19:11 -0600)]
git-send-email: allow an email alias for --from

Signed-off-by: Michael Hendricks <michael@ndrix.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agocvsserver: always initialize state in argsplit()
Frank Lichtenheld [Sun, 17 Jun 2007 08:31:02 +0000 (10:31 +0200)]
cvsserver: always initialize state in argsplit()

Other code assumes that this is initialized, so do it
even if there were no arguments given.

Signed-off-by: Dirk Koopman <djk@tobit.co.uk>
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agostash: allow running from a subdirectory
James Bowes [Fri, 6 Jul 2007 19:57:47 +0000 (15:57 -0400)]
stash: allow running from a subdirectory

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule(1): update description and key names
Lars Hjemli [Fri, 6 Jul 2007 17:38:38 +0000 (19:38 +0200)]
git-submodule(1): update description and key names

When git-submodule was updated to allow mapping between submodule name and
submodule path, the documentation was left untouched.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoEnable "git rerere" by the config variable rerere.enabled
Johannes Schindelin [Fri, 6 Jul 2007 12:05:59 +0000 (13:05 +0100)]
Enable "git rerere" by the config variable rerere.enabled

Earlier, "git rerere" was enabled by creating the directory
.git/rr-cache.  That is definitely not in line with most other
features, which are enabled by a config variable.

So, check the config variable "rerere.enabled". If it is set
to "false" explicitely, do not activate rerere, even if
.git/rr-cache exists. This should help when you want to disable
rerere temporarily.

If "rerere.enabled" is not set at all, fall back to detection
of the directory .git/rr-cache.

[jc: with minimum tweaks]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd [verse] to the SYNOPSIS section of git-submodule.txt.
Matt Kraai [Sat, 7 Jul 2007 00:56:31 +0000 (17:56 -0700)]
Add [verse] to the SYNOPSIS section of git-submodule.txt.

The SYNOPSIS section of git-submodule.txt contains two forms.  Since
it doesn't use the verse style, the line boundary between them is not
preserved and the second form can appear on the same line as the first
form.  Adding [verse] enables the verse style, which preserves the
line boundary between them.

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoChange "added.moved or removed" to "added, moved or removed" in
Matt Kraai [Sat, 7 Jul 2007 01:23:54 +0000 (18:23 -0700)]
Change "added.moved or removed" to "added, moved or removed" in

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFixed a formulation mistake in Documentation/user-manual.txt
Marcus Fritzsch [Fri, 6 Jul 2007 07:02:20 +0000 (09:02 +0200)]
Fixed a formulation mistake in Documentation/user-manual.txt

This one fixes a small formulation weirdness in
Documentation/user-manual.txt

Signed-off-by: Marcus Fritzsch <m@fritschy.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoPer-path attribute based hunk header selection.
Junio C Hamano [Fri, 6 Jul 2007 07:45:10 +0000 (00:45 -0700)]
Per-path attribute based hunk header selection.

This makes"diff -p" hunk headers customizable via gitattributes mechanism.
It is based on Johannes's earlier patch that allowed to define a single
regexp to be used for everything.

The mechanism to arrive at the regexp that is used to define hunk header
is the same as other use of gitattributes.  You assign an attribute, funcname
(because "diff -p" typically uses the name of the function the patch is about
as the hunk header), a simple string value.  This can be one of the names of
built-in pattern (currently, "java" is defined) or a custom pattern name, to
be looked up from the configuration file.

  (in .gitattributes)
  *.java   funcname=java
  *.perl   funcname=perl

  (in .git/config)
  [funcname]
    java = ... # ugly and complicated regexp to override the built-in one.
    perl = ... # another ugly and complicated regexp to define a new one.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFuture-proof source for changes in xdemitconf_t
Johannes Schindelin [Wed, 4 Jul 2007 18:05:46 +0000 (19:05 +0100)]
Future-proof source for changes in xdemitconf_t

The instances of xdemitconf_t were initialized member by member.
Instead, initialize them to all zero, so we do not have
to update those places each time we introduce a new member.

[jc: minimally fixed by getting rid of a new global]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoIntroduce diff_filespec_is_binary()
Junio C Hamano [Fri, 6 Jul 2007 07:18:54 +0000 (00:18 -0700)]
Introduce diff_filespec_is_binary()

This replaces an explicit initialization of filespec->is_binary
field used for rename/break followed by direct access to that
field with a wrapper function that lazily iniaitlizes and
accesses the field.  We would add more attribute accesses for
the use of diff routines, and it would be better to make this
abstraction earlier.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoPrefer EMAIL to username@hostname.
Matt Kraai [Fri, 6 Jul 2007 00:29:41 +0000 (17:29 -0700)]
Prefer EMAIL to username@hostname.

The environment variable $EMAIL gives a better default of user's
preferred e-mail address than the hardcoded "username@hostname",
as it is understood by many existing programs.

We still honor GIT_*_EMAIL environment variables and user.email
configuration variable give them higher precedence, so that the
user can override $EMAIL or "username@hostname", as they are
likely to be more specific to the context of working on a
particular project.

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agomake git-clone GIT_WORK_TREE aware
Matthias Lederhofer [Thu, 5 Jul 2007 23:10:44 +0000 (01:10 +0200)]
make git-clone GIT_WORK_TREE aware

If GIT_WORK_TREE is set git-clone will use that path for the
working tree.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-clone: split up long &&-command-chain and use a function for cleanup
Matthias Lederhofer [Thu, 5 Jul 2007 22:54:33 +0000 (00:54 +0200)]
git-clone: split up long &&-command-chain and use a function for cleanup

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofix remote.origin.url in tutorial.txt
Alecs King [Thu, 5 Jul 2007 16:21:16 +0000 (00:21 +0800)]
fix remote.origin.url in tutorial.txt

Bob cloned from Alice.
The origin url is actually Alice's repo.

Signed-off-by: Alecs King <alecsk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: fail gracefully when a filter fails
Johannes Schindelin [Wed, 4 Jul 2007 14:36:01 +0000 (15:36 +0100)]
filter-branch: fail gracefully when a filter fails

A common mistake is to provide a filter which fails unwantedly. For
example, this will stop in the middle:

git filter-branch --env-filter '
test $GIT_COMMITTER_EMAIL = xyz &&
export GIT_COMMITTER_EMAIL = abc' rewritten

When $GIT_COMMITTER_EMAIL is not "xyz", the test fails, and consequently
the whole filter has a non-zero exit status. However, as demonstrated
in this example, filter-branch would just stop, and the user would be
none the wiser.

Also, a failing msg-filter would not have been caught, as was the
case with one of the tests.

This patch fixes both issues, by paying attention to the exit status
of msg-filter, and by saying what failed before exiting.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd -v|--verbose to git remote to show remote url
Alex Riesen [Thu, 5 Jul 2007 22:06:56 +0000 (00:06 +0200)]
Add -v|--verbose to git remote to show remote url

Many other commands already have such an option, and I find it
practical to see where all the remotes actually come from.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch documentation: clarify which filters are eval'ed
Johannes Schindelin [Thu, 5 Jul 2007 16:07:48 +0000 (17:07 +0100)]
filter-branch documentation: clarify which filters are eval'ed

All filters, except the commit filter, are evaluated.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-stash: allow more descriptive reminder message when saving
Junio C Hamano [Thu, 5 Jul 2007 05:46:09 +0000 (22:46 -0700)]
git-stash: allow more descriptive reminder message when saving

This allows you to say:

$ git stash starting to implement X

while creating a stash, and the resulting "stash list entry
would read as:

$ git stash list
        stash@{0}: On master: starting to implement X

instead of the default message which talks about the commit the
stash happens to be based on (hence does not have much to do
with what the stashed change is trying to do).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd urls.txt to git-clone man page
Andrew Ruder [Wed, 4 Jul 2007 22:21:36 +0000 (17:21 -0500)]
Add urls.txt to git-clone man page

Since git-clone is one of the many commands taking
URLs to remote repositories as an argument, it should include
the URL-types list from urls.txt.

Split up urls.txt into urls.txt and urls-remotes.txt.  The latter
should be used by anything besides git-clone where a discussion of
using .git/config and .git/remotes/ to name URLs just doesn't make
as much sense.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix git-stash(1) markup.
Junio C Hamano [Thu, 5 Jul 2007 05:09:20 +0000 (22:09 -0700)]
Fix git-stash(1) markup.

Noticed by Randal L. Schwartz.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAllow rebase to run if upstream is completely merged
Johannes Sixt [Wed, 4 Jul 2007 20:09:10 +0000 (22:09 +0200)]
Allow rebase to run if upstream is completely merged

Consider this history:

  o--o-...-B          <- origin
      \     \
       x--x--M--x--x  <- master

In this situation, rebase considers master fully up-to-date and would
not do anything. However, if there were additional commits on origin,
the rebase would run and move the commits x on top of origin.

Here we change rebase to short-circuit out only if the history since origin
is strictly linear. Consequently, the above as well as a history like this
would be linearized:

  o--o               <- origin
      \
       x--x
        \  \
         x--M--x--x  <- master

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoRemove USE_PAGER from git-pickaxe and git-annotate
Andrew Ruder [Wed, 4 Jul 2007 22:21:49 +0000 (17:21 -0500)]
Remove USE_PAGER from git-pickaxe and git-annotate

git-blame (and friends) specifically leave the pager turned off
in the case that --incremental is specified as this isn't for
human consumption.  git-pickaxe and git-annotate will turn it on
themselves otherwise.

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-svn: fix blocking with svn:// servers after do_switch
Eric Wong [Wed, 4 Jul 2007 21:07:42 +0000 (14:07 -0700)]
git-svn: fix blocking with svn:// servers after do_switch

We now explicitly disconnect before starting new SVN::Ra
connections.  SVN::Ra objects will automatically be disconnected
from the server on DESTROY.

SVN servers seem to have problems accepting multiple connections
from one client, and the SVN library has trouble being connected
to multiple servers at once.  This appears to cause opening the
second connection to block, and cause git-svn to be unusable
after using the do_switch() function.

git-svn opens another connection because a workaround is
necesary for the buggy reparent function handling on certain
versions of svn:// and svn+ssh:// servers.  Instead of using the
reparent function (analogous to chdir), it will reopen a new
connection to a different URL on the SVN server.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch documentation: some more touch-ups.
Johannes Sixt [Wed, 4 Jul 2007 07:32:47 +0000 (09:32 +0200)]
filter-branch documentation: some more touch-ups.

- The map function used to fail, but no longer does (since 3520e1e8687.)
- Fix the "edge-graft" example.
- Show the same using .git/info/grafts.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: added missing warn function
Steffen Prohaska [Wed, 4 Jul 2007 08:36:24 +0000 (10:36 +0200)]
filter-branch: added missing warn function

--tag-name-filter may have failed before because
warn is used for reporting but was not available.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAlter git-checkout reflog message to include "from" branch
Sean [Wed, 4 Jul 2007 08:33:36 +0000 (04:33 -0400)]
Alter git-checkout reflog message to include "from" branch

As suggested by Junio, adding the current branch name to the
reflog message for git-checkout would be helpful.  For example:

   "checkout: moving from next to master"

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-init: set core.worktree if GIT_WORK_TREE is specified
Matthias Lederhofer [Tue, 3 Jul 2007 22:49:19 +0000 (00:49 +0200)]
git-init: set core.worktree if GIT_WORK_TREE is specified

Now you can do the following to create a repository which
has a separate working tree:

    /tmp/foo$ export GIT_DIR=/tmp/bar
    /tmp/foo$ git --work-tree . init
    Initialized empty Git repository in /tmp/bar/
    /tmp/foo$ git config core.worktree
    /tmp/foo

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDo not check if getcwd() result begins with a slash.
Junio C Hamano [Wed, 4 Jul 2007 19:45:42 +0000 (12:45 -0700)]
Do not check if getcwd() result begins with a slash.

In user space, and for getcwd(), the check to see if the
resulting path begins with a '/' does not make sense.  This is
merely a mistake by Linus who is so used to code for the kernel,
where a d_path() return value pathname can be either a real
path, or something like "pipe:[8003]", and the difference is the
'/' at the beginning.

Pointed out by Dscho, Matthias Lederhofer and clarified by Linus.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: a few more touch ups to the man page
Johannes Schindelin [Wed, 4 Jul 2007 14:50:45 +0000 (15:50 +0100)]
filter-branch: a few more touch ups to the man page

All based on comments from Frank Lichtenheld.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: make output nicer
Johannes Schindelin [Wed, 4 Jul 2007 14:33:30 +0000 (15:33 +0100)]
filter-branch: make output nicer

Instead of filling the screen with progress lines, use \r so that
the progress can be seen, but warning messages are more visible.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix t5516 to create test repo without hooks
Alex Riesen [Wed, 4 Jul 2007 12:06:04 +0000 (14:06 +0200)]
Fix t5516 to create test repo without hooks

Otherwise the hooks will be executed on cygwin and the test will fail
because of the contributed hooks.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofilter-branch: Avoid an error message in the map function.
Johannes Sixt [Wed, 4 Jul 2007 12:08:17 +0000 (14:08 +0200)]
filter-branch: Avoid an error message in the map function.

When the map function didn't find the rewritten commit of the passed in
original id, it printed the original id, but it still fell through to
the 'cat', which failed with an error message.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoHandle format.subjectprefix for every command which accepts --pretty
Alex Riesen [Wed, 4 Jul 2007 10:37:27 +0000 (12:37 +0200)]
Handle format.subjectprefix for every command which accepts --pretty

Because the --pretty can be given as --pretty=email which historically produced
mails with patches. IOW, exactly what git-format-patch does.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoHandle missing prefix for "Subject:" as if no prefix given
Alex Riesen [Wed, 4 Jul 2007 10:33:46 +0000 (12:33 +0200)]
Handle missing prefix for "Subject:" as if no prefix given

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate reflog message created for stashes
Junio C Hamano [Wed, 4 Jul 2007 19:37:17 +0000 (12:37 -0700)]
Update reflog message created for stashes

A stash is about a change on top of an existing commit, and not
about that commit that happened to be on which the change was
created.  Match the message we see in "git stash list" with the
commit log message to make this clear.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
13 years agorepack: don't report "Nothing new to pack." if -q is given
Uwe Kleine-König [Tue, 3 Jul 2007 08:47:58 +0000 (10:47 +0200)]
repack: don't report "Nothing new to pack." if -q is given

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd core.pager config variable.
Brian Gernhardt [Tue, 3 Jul 2007 18:18:11 +0000 (14:18 -0400)]
Add core.pager config variable.

This adds a configuration variable that performs the same function as,
but is overridden by, GIT_PAGER.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Acked-by: Johannes E. Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: Fix two instances of the same typo
CJ van den Berg [Wed, 4 Jul 2007 16:22:14 +0000 (18:22 +0200)]
git-submodule: Fix two instances of the same typo

They break the output of git submodule status.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint'
Junio C Hamano [Wed, 4 Jul 2007 05:56:59 +0000 (22:56 -0700)]
Merge branch 'maint'

* maint:
  Document -<n> for git-format-patch
  glossary: add 'reflog'
  diff --no-index: fix --name-status with added files
  Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long

13 years agofilter-branch: add a test for the commit removal example
Johannes Schindelin [Tue, 3 Jul 2007 16:50:19 +0000 (17:50 +0100)]
filter-branch: add a test for the commit removal example

In the man page, there is an example which describes how to remove
single commits (although it keeps the changes which were not reverted
in the next non-removed commit). Better make sure that it works as
expected.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofsck --lost-found writes to subdirectories in .git/lost-found/
Jonas Fonseca [Wed, 4 Jul 2007 01:33:11 +0000 (03:33 +0200)]
fsck --lost-found writes to subdirectories in .git/lost-found/

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd diff-option --ext-diff
Johannes Schindelin [Sat, 30 Jun 2007 17:47:07 +0000 (18:47 +0100)]
Add diff-option --ext-diff

To prevent funky games with external diff engines, git-log and
friends prevent external diff engines from being called. That makes
sense in the context of git-format-patch or git-rebase.

However, for "git log -p" it is not so nice to get the message
that binary files cannot be compared, while "git diff" has no
problems with them, if you provided an external diff driver.

With this patch, "git log --ext-diff -p" will do what you expect,
and the option "--no-ext-diff" can be used to override that
setting.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocument git-filter-branch
Johannes Schindelin [Tue, 3 Jul 2007 23:41:55 +0000 (00:41 +0100)]
Document git-filter-branch

This moves the documentation in git-filter-branch.sh to its own
man page, with a few touch ups (incorporating comments by Frank
Lichtenheld).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agostash: end commit log with a newline
Uwe Kleine-König [Tue, 3 Jul 2007 08:59:06 +0000 (10:59 +0200)]
stash: end commit log with a newline

If I do

git cat-file commit $commitid

for a commit created by stash, the next prompt starts directly after the
shortlog of HEAD.

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate draft Release Notes for 1.5.3
Junio C Hamano [Tue, 3 Jul 2007 19:04:24 +0000 (12:04 -0700)]
Update draft Release Notes for 1.5.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocument -<n> for git-format-patch
Miklos Vajna [Tue, 3 Jul 2007 23:38:29 +0000 (01:38 +0200)]
Document -<n> for git-format-patch

The -<n> option was not mentioned in git-format-patch's manpage till
now. Fix this.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoglossary: add 'reflog'
Johannes Schindelin [Tue, 3 Jul 2007 20:28:24 +0000 (21:28 +0100)]
glossary: add 'reflog'

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodiff --no-index: fix --name-status with added files
Johannes Schindelin [Tue, 3 Jul 2007 15:01:06 +0000 (16:01 +0100)]
diff --no-index: fix --name-status with added files

Without this patch, an added file would be reported as /dev/null.

Noticed by David Kastrup.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDon't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
Jim Meyering [Tue, 3 Jul 2007 10:40:20 +0000 (12:40 +0200)]
Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long

There is no restriction on the length of the name returned by
get_object_directory, other than the fact that it must be a stat'able
git object directory.  That means its name may have length up to
PATH_MAX-1 (i.e., often 4095) not counting the trailing NUL.

Combine that with the assumption that the concatenation of that name and
suffixes like "/info/alternates" and "/pack/---long-name---.idx" will fit
in a buffer of length PATH_MAX, and you see the problem.  Here's a fix:

    sha1_file.c (prepare_packed_git_one): Lengthen "path" buffer
    so we are guaranteed to be able to append "/pack/" without checking.
    Skip any directory entry that is too long to be appended.
    (read_info_alternates): Protect against a similar buffer overrun.

Before this change, using the following admittedly contrived environment
setting would cause many git commands to clobber their stack and segfault
on a system with PATH_MAX == 4096:

  t=$(perl -e '$s=".git/objects";$n=(4096-6-length($s))/2;print "./"x$n . $s')
  export GIT_ALTERNATE_OBJECT_DIRECTORIES=$t
  touch g
  ./git-update-index --add g

If you run the above commands, you'll soon notice that many
git commands now segfault, so you'll want to do this:

  unset GIT_ALTERNATE_OBJECT_DIRECTORIES

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMark disused commit walkers officially deprecated. v1.5.3-rc0
Junio C Hamano [Tue, 3 Jul 2007 06:29:54 +0000 (23:29 -0700)]
Mark disused commit walkers officially deprecated.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-stash: make "save" the default action again.
Junio C Hamano [Tue, 3 Jul 2007 06:15:45 +0000 (23:15 -0700)]
git-stash: make "save" the default action again.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoRewrite "git-frotz" to "git frotz"
Junio C Hamano [Tue, 3 Jul 2007 05:52:14 +0000 (22:52 -0700)]
Rewrite "git-frotz" to "git frotz"

This uses the remove-dashes target to replace "git-frotz" to "git frotz".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoStart deprecating "git-command" in favor of "git command"
Linus Torvalds [Sat, 30 Jun 2007 18:49:17 +0000 (11:49 -0700)]
Start deprecating "git-command" in favor of "git command"

I realize that a lot of people use the "git-xyzzy" format, and we have
various historical reasons for it, but I also think that most people have
long since started thinking of the git command as a single command with
various subcommands, and we've long had the documentation talk about it
that way.

Slowly migrating away from the git-xyzzy format would allow us to
eventually no longer install hundreds of binaries (even if most of them
are symlinks or hardlinks) in users $PATH, and the _original_ reasons for
it (implementation issues and bash completion) are really long long gone.

Using "git xyzzy" also has some fundamental advantages, like the ability
to specify things like paging ("git -p xyzzy") and making the whole notion
of aliases act like other git commands (which they already do, but they do
*not* have a "git-xyzzy" form!)

Anyway, while actually removing the "git-xyzzy" things is not practical
right now, we can certainly start slowly to deprecate it internally inside
git itself - in the shell scripts we use, and the test vectors.

This patch adds a "remove-dashes" makefile target, which does that. It
isn't particularly efficient or smart, but it *does* successfully rewrite
a lot of our shell scripts to use the "git xyzzy" form for all built-in
commands.

(For non-builtins, the "git xyzzy" format implies an extra execve(), so
this script leaves those alone).

So apply this patch, and then run

make remove-dashes
make test
git commit -a

to generate a much larger patch that actually starts this transformation.

(The only half-way subtle thing about this is that it also fixes up
git-filter-branch.sh for the new world order by adding quoting around
the use of "git-commit-tree" as an argument. It doesn't need it in that
format, but when changed into "git commit-tree" it is no longer a single
word, and the quoting maintains the old behaviour).

NOTE! This does not yet mean that you can actually stop installing the
"git-xyzzy" binaries for the builtins. There are some remaining places
that want to use the old form, this just removes the most obvious ones
that can easily be done automatically.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'jo/init'
Junio C Hamano [Tue, 3 Jul 2007 04:48:08 +0000 (21:48 -0700)]
Merge branch 'jo/init'

* jo/init:
  Quiet the output from git-init when cloning, if requested.
  Add an option to quiet git-init.

13 years agogit-fsck: add --lost-found option
Johannes Schindelin [Tue, 3 Jul 2007 00:33:54 +0000 (01:33 +0100)]
git-fsck: add --lost-found option

With this option, dangling objects are not only reported, but also
written to .git/lost-found/commit/ or .git/lost-found/other/. This
option implies '--full' and '--no-reflogs'.

'git fsck --lost-found' is meant as a replacement for git-lost-found.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint'
Junio C Hamano [Tue, 3 Jul 2007 04:05:59 +0000 (21:05 -0700)]
Merge branch 'maint'

* maint:
  Correctly document the name of the global excludes file configuration

13 years agoformat-patch: Add format.subjectprefix config option
Adam Roben [Mon, 2 Jul 2007 00:48:59 +0000 (17:48 -0700)]
format-patch: Add format.subjectprefix config option

This change lets you use the format.subjectprefix config option to override the
default subject prefix.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoTest 'git add' for unmerged entries when core.symlinks=false.
Johannes Sixt [Mon, 2 Jul 2007 11:28:42 +0000 (13:28 +0200)]
Test 'git add' for unmerged entries when core.symlinks=false.

In 20314271679e169f324c118c69c8d9e0399feec9 git add was fixed if unmerged
entries are in the index and core.filemode=false. core.symlinks=false is
a similar case, which touches the same code path. Here is a test that
makes sure that the symlink property in the index is preserved, too.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago"git-push $URL" without refspecs pushes only matching branches
Junio C Hamano [Mon, 2 Jul 2007 02:00:08 +0000 (19:00 -0700)]
"git-push $URL" without refspecs pushes only matching branches

When "git push" is run without any refspec (neither on the
command line nor in the config), we used to push "matching refs"
in the sense that anything under refs/ hierarchy that exist on
both ends were updated.  This used to be a sane default for
publishing your repository to another back when we did not have
refs/remotes/ hierarchy, but it does not make much sense these
days.

This changes the semantics to push only "matching branches".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoCorrectly document the name of the global excludes file configuration
Michael Hendricks [Mon, 2 Jul 2007 16:48:34 +0000 (10:48 -0600)]
Correctly document the name of the global excludes file configuration

Signed-off-by: Michael Hendricks <michael@ndrix.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint'
Junio C Hamano [Mon, 2 Jul 2007 23:41:44 +0000 (16:41 -0700)]
Merge branch 'maint'

* maint:
  Make git-prune submodule aware (and fix a SEGFAULT in the process)

13 years agoMake git-prune submodule aware (and fix a SEGFAULT in the process)
Andy Parkins [Mon, 2 Jul 2007 12:56:58 +0000 (13:56 +0100)]
Make git-prune submodule aware (and fix a SEGFAULT in the process)

I ran git-prune on a repository and got this:

 $ git-prune
 error: Object 228f8065b930120e35fc0c154c237487ab02d64a is a blob, not a commit
 Segmentation fault (core dumped)

This repository was a strange one in that it was being used to provide
its own submodule.  That is, the repository was cloned into a
subdirectory, an independent branch checked out in that subdirectory,
and then it was marked as a submodule.  git-prune then failed in the
above manner.

The problem was that git-prune was not submodule aware in two areas.

Linus said:

 > So what happens is that something traverses a tree object, looks at each
 > entry, sees that it's not a tree, and tries to look it up as a blob. But
 > subprojects are commits, not blobs, and then when you look at the object
 > more closely, you get the above kind of object type confusion.

and included a patch to add an S_ISGITLINK() test to reachable.c's
process_tree() function.  That fixed the first git-prune error, and
stopped it from trying to process the gitlink entries in trees as if
they were pointers to other trees (and of course failing, because
gitlinks _aren't_ trees).  That part of this patch is his.

The second area is add_cache_refs().  This is called before starting the
reachability analysis, and was calling lookup_blob() on every object
hash found in the index.  However, it is no longer true that every hash
in the index is a pointer to a blob, some of them are gitlinks, and are
not backed by any object at all, they are commits in another repository.
Normally this bug was not causing any problems, but in the case of the
self-referencing repository described above, it meant that the gitlink
hash was being marked as being of type OBJ_BLOB by add_cache_refs() call
to lookup_blob().  Then later, because that hash was also pointed to by
a ref, add_one_ref() would treat it as a commit; lookup_commit() would
return a NULL because that object was already noted as being an
OBJ_BLOB, not an OBJ_COMMIT; and parse_commit_buffer() would SEGFAULT on
that NULL pointer.

The fix made by this patch is to not blindly call lookup_blob() in
reachable.c's add_cache_refs(), and instead skip any index entries that
are S_ISGITLINK().

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'ew/svn'
Junio C Hamano [Mon, 2 Jul 2007 08:46:22 +0000 (01:46 -0700)]
Merge branch 'ew/svn'

* ew/svn:
  git-svn: allow dcommit to retain local merge information

13 years agoMerge branch 'ns/stash'
Junio C Hamano [Mon, 2 Jul 2007 08:45:57 +0000 (01:45 -0700)]
Merge branch 'ns/stash'

* ns/stash:
  Documentation: quote {non-attributes} for asciidoc
  git-stash: don't complain when listing in a repo with no stash
  git-stash: fix "can't shift that many" with no arguments
  git-stash: fix "no arguments" case in documentation
  git-stash: require "save" to be explicit and update documentation
  Document git-stash
  Add git-stash script

13 years agoMerge branch 'js/rebase'
Junio C Hamano [Mon, 2 Jul 2007 08:45:47 +0000 (01:45 -0700)]
Merge branch 'js/rebase'

* js/rebase:
  Teach rebase -i about --preserve-merges
  rebase -i: provide reasonable reflog for the rebased branch
  rebase -i: several cleanups
  ignore git-rebase--interactive
  Teach rebase an interactive mode
  Move the pick_author code to git-sh-setup

13 years agoMerge branch 'jc/diffcore'
Junio C Hamano [Mon, 2 Jul 2007 08:45:12 +0000 (01:45 -0700)]
Merge branch 'jc/diffcore'

* jc/diffcore:
  diffcore-delta.c: Ignore CR in CRLF for text files
  diffcore-delta.c: update the comment on the algorithm.
  diffcore_filespec: add is_binary
  diffcore_count_changes: pass diffcore_filespec

13 years agoDocumentation: minor cleanups to branch/checkout wording
Jeff King [Mon, 2 Jul 2007 05:28:20 +0000 (01:28 -0400)]
Documentation: minor cleanups to branch/checkout wording

Change "to made" to "made to", which is a typo. Use "reflog"
instead of "ref log", which is used elsewhere throughout the
documentation.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation: quote {non-attributes} for asciidoc
Jeff King [Mon, 2 Jul 2007 05:24:59 +0000 (01:24 -0400)]
Documentation: quote {non-attributes} for asciidoc

Asciidoc treats {foo} as an attribute to be substituted; if
'foo' doesn't exist as an attribute, then the entire line
gets dropped. When the literal {foo} is desired, \{foo} is
required.

The exceptions to this rule are:
  - inside literal blocks
  - if the 'foo' contains non-alphanumeric characters (e.g.,
    {foo|bar} is assumed not to be an attribute)

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMake '!' aliases more useful
Johannes Schindelin [Sun, 1 Jul 2007 21:51:58 +0000 (22:51 +0100)]
Make '!' aliases more useful

When an alias starts with an exclamation mark, the rest is interpreted
as a shell command. However, all arguments passed to git used to be
ignored.

Now you can have an alias like

$ git config alias.e '!echo'

and

$ git e Hello World

does what you expect it to do.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogetenv/setenv: use constants if available
Matthias Lederhofer [Thu, 28 Jun 2007 14:15:25 +0000 (16:15 +0200)]
getenv/setenv: use constants if available

There were places using "GIT_DIR" instead of GIT_DIR_ENVIRONMENT and
"GIT_CONFIG" instead of CONFIG_ENVIRONMENT.  This makes it easier to
find all places touching an environment variable using git grep or
similar tools.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-clone: fetch possibly detached HEAD over dumb http
Sven Verdoolaege [Fri, 29 Jun 2007 08:31:08 +0000 (10:31 +0200)]
git-clone: fetch possibly detached HEAD over dumb http

git-clone supports cloning from a repo with detached HEAD,
but if this HEAD is not behind any branch tip then it
would not have been fetched over dumb http, resulting in a

fatal: Not a valid object name HEAD

Since 928c210a, this would also happen on a http repo
with a HEAD that is a symbolic link where someone has
forgotton to run update-server-info.

Signed-off-by: Sven Verdoolaege <skimo@liacs.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: Instead of using only annotated tags, use any tags.
Emil Medve [Tue, 26 Jun 2007 23:40:58 +0000 (18:40 -0500)]
git-submodule: Instead of using only annotated tags, use any tags.

Some repositories might not use/have annotated tags (for example the
ones created with git-cvsimport) and git-submodule status might fail
because git-describe might fail to find a tag.  This change allows the
status of a submodule to be described/displayed relative to lightweight
tags as well.

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-submodule: provide easy way of adding new submodules
Sven Verdoolaege [Sun, 24 Jun 2007 21:06:07 +0000 (23:06 +0200)]
git-submodule: provide easy way of adding new submodules

To make a submodule effectively usable, the path and
a URL where the submodule can be cloned need to be stored
in .gitmodules.  This subcommand takes care of setting
this information after cloning the new submodule.
Only the index is updated, so, if needed, the user may still
change the URL or switch to a different branch of the submodule
before committing.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate public documentation links for 1.5.2.3
Junio C Hamano [Mon, 2 Jul 2007 08:14:00 +0000 (01:14 -0700)]
Update public documentation links for 1.5.2.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge 1.5.2.3 in
Junio C Hamano [Mon, 2 Jul 2007 08:12:57 +0000 (01:12 -0700)]
Merge 1.5.2.3 in

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.2.3 v1.5.2.3
Junio C Hamano [Mon, 2 Jul 2007 07:35:58 +0000 (00:35 -0700)]
GIT 1.5.2.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDocumentation: quote {non-attributes} for asciidoc
Jeff King [Mon, 2 Jul 2007 05:24:59 +0000 (01:24 -0400)]
Documentation: quote {non-attributes} for asciidoc

Asciidoc treats {foo} as an attribute to be substituted; if
'foo' doesn't exist as an attribute, then the entire line
gets dropped. When the literal {foo} is desired, \{foo} is
required.

The exceptions to this rule are:
  - inside literal blocks
  - if the 'foo' contains non-alphanumeric characters (e.g.,
    {foo|bar} is assumed not to be an attribute)

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-stash: don't complain when listing in a repo with no stash
Jeff King [Mon, 2 Jul 2007 04:21:24 +0000 (00:21 -0400)]
git-stash: don't complain when listing in a repo with no stash

Previously, the git-log invocation would complain if a repo
had not had any stashes created in it yet:

$ git-init
$ git-stash
fatal: ambiguous argument 'refs/stash': unknown revision or
  path not in the working tree.
Use '--' to separate paths from revisions

Instead, we only call git-log if we actually have a
refs/stash. We could alternatively create the ref when any
stash command is called, but it's better for the 'list'
command to not require write access to the repo.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-stash: fix "can't shift that many" with no arguments
Jeff King [Mon, 2 Jul 2007 04:20:34 +0000 (00:20 -0400)]
git-stash: fix "can't shift that many" with no arguments

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-stash: fix "no arguments" case in documentation
Jeff King [Mon, 2 Jul 2007 04:20:06 +0000 (00:20 -0400)]
git-stash: fix "no arguments" case in documentation

Commit 9488e875 changed this from 'save' to 'list', but
missed this spot in the documentation.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-stash: require "save" to be explicit and update documentation
Junio C Hamano [Sun, 1 Jul 2007 22:29:01 +0000 (15:29 -0700)]
git-stash: require "save" to be explicit and update documentation

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'rs/diff'
Junio C Hamano [Sun, 1 Jul 2007 21:58:09 +0000 (14:58 -0700)]
Merge branch 'rs/diff'

* rs/diff:
  diff: round down similarity index
  diffcore-rename: don't change similarity index based on basename equality

13 years agoMerge branch 'jc/quote'
Junio C Hamano [Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)]
Merge branch 'jc/quote'

* jc/quote:
  Add core.quotepath configuration variable.

13 years agoFix t5516-fetch for systems where `wc -l` outputs whitespace.
Brian Gernhardt [Sun, 1 Jul 2007 15:48:54 +0000 (11:48 -0400)]
Fix t5516-fetch for systems where `wc -l` outputs whitespace.

When wc outputs whitespace, the test "$(command | wc -l)" = 1 is
broken because "   1" != "1".  Let the shell eat the whitespace by
using test 1 = $(command | wc -l) instead.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit add: respect core.filemode with unmerged entries
Johannes Schindelin [Fri, 29 Jun 2007 17:32:46 +0000 (18:32 +0100)]
git add: respect core.filemode with unmerged entries

When a merge left unmerged entries, git add failed to pick up the
file mode from the index, when core.filemode == 0. If more than one
unmerged entry is there, the order of stage preference is 2, 1, 3.

Noticed by Johannes Sixt.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agot7004: ship trustdb to avoid gpg warnings
Johannes Schindelin [Sun, 1 Jul 2007 03:14:01 +0000 (20:14 -0700)]
t7004: ship trustdb to avoid gpg warnings

This avoids warning messages from gpg while verifying the tags; without it,
the program complains that the key is not certified with a trusted signature.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'ml/worktree'
Junio C Hamano [Sun, 1 Jul 2007 20:11:01 +0000 (13:11 -0700)]
Merge branch 'ml/worktree'

* ml/worktree:
  make git barf when an alias changes environment variables

13 years agoMerge branch 'ei/worktree+filter'
Junio C Hamano [Sun, 1 Jul 2007 20:10:42 +0000 (13:10 -0700)]
Merge branch 'ei/worktree+filter'

* ei/worktree+filter:
  filter-branch: always export GIT_DIR if it is set
  setup_git_directory: fix segfault if repository is found in cwd
  test GIT_WORK_TREE
  extend rev-parse test for --is-inside-work-tree
  Use new semantics of is_bare/inside_git_dir/inside_work_tree
  introduce GIT_WORK_TREE to specify the work tree
  test git rev-parse
  rev-parse: introduce --is-bare-repository
  rev-parse: document --is-inside-git-dir

13 years agoMerge branch 'fl/config'
Junio C Hamano [Sun, 1 Jul 2007 06:49:01 +0000 (23:49 -0700)]
Merge branch 'fl/config'

* fl/config:
  config: add support for --bool and --int while setting values

13 years agoMerge branch 'mk/svn'
Junio C Hamano [Sun, 1 Jul 2007 06:48:54 +0000 (23:48 -0700)]
Merge branch 'mk/svn'

* mk/svn:
  git-svn: honor ~/.subversion/ client cert file settings.

13 years agoDocument git-stash
しらいしななこ [Sun, 1 Jul 2007 05:26:08 +0000 (14:26 +0900)]
Document git-stash

This describes the git-stash command.

I borrowed a few paragraphs from Johannes's version, and added a few
examples.

Signed-off-by: Nanako Shiraishi <nanako3@bluebottle.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-svn: cache max revision in rev_db databases
Sam Vilain [Sat, 30 Jun 2007 08:56:14 +0000 (20:56 +1200)]
git-svn: cache max revision in rev_db databases

Cache the maximum revision for each rev_db URL rather than looking it
up each time.  This saves a lot of time when rebuilding indexes on a
freshly cloned repository.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>