git.git
18 years agomerge-recur: do not setenv("GIT_INDEX_FILE")
Johannes Schindelin [Wed, 9 Aug 2006 13:07:31 +0000 (15:07 +0200)]
merge-recur: do not setenv("GIT_INDEX_FILE")

Since there are no external calls left in merge-recur, we do not need
to set the environment variable GIT_INDEX_FILE all the time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: do not call git-write-tree
Johannes Schindelin [Wed, 9 Aug 2006 13:04:16 +0000 (15:04 +0200)]
merge-recur: do not call git-write-tree

Since merge-recur is in C, and uses libgit, it can call the relevant
functions directly, without writing the index file.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recursive: fix rename handling
Johannes Schindelin [Fri, 4 Aug 2006 16:21:41 +0000 (18:21 +0200)]
merge-recursive: fix rename handling

To handle renames properly, we iterate through all file names of both
heads, the current one, and the one to be merged.

Only that there was a bug, where it was checked if the file name was present
in both heads, but the result of the check was never used. Instead, the
merge proceeded as if both heads contained that file.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago.gitignore: git-merge-recur is a built file.
Junio C Hamano [Thu, 3 Aug 2006 23:17:51 +0000 (16:17 -0700)]
.gitignore: git-merge-recur is a built file.

Also it is OK to omit the documentation for it at least for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: virtual commits shall never be parsed
Johannes Schindelin [Mon, 31 Jul 2006 10:42:35 +0000 (12:42 +0200)]
merge-recur: virtual commits shall never be parsed

It would not make sense to parse a virtual commit, therefore set the
"parsed" flag to 1.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: use the unpack_trees() interface instead of exec()ing read-tree
Johannes Schindelin [Sun, 30 Jul 2006 18:27:10 +0000 (20:27 +0200)]
merge-recur: use the unpack_trees() interface instead of exec()ing read-tree

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/read-tree' into js/c-merge-recursive
Junio C Hamano [Mon, 31 Jul 2006 06:42:10 +0000 (23:42 -0700)]
Merge branch 'js/read-tree' into js/c-merge-recursive

* js/read-tree: (107 commits)
  read-tree: move merge functions to the library
  read-trees: refactor the unpack_trees() part
  tar-tree: illustrate an obscure feature better
  git.c: allow alias expansion without a git directory
  setup_git_directory_gently: do not barf when GIT_DIR is given.
  Build on Debian GNU/kFreeBSD
  Call setup_git_directory() much earlier
  Call setup_git_directory() early
  Display an error from update-ref if target ref name is invalid.
  Fix http-fetch
  t4103: fix binary patch application test.
  git-apply -R: binary patches are irreversible for now.
  Teach git-apply about '-R'
  Makefile: ssh-pull.o depends on ssh-fetch.c
  log and diff family: honor config even from subdirectories
  git-reset: detect update-ref error and report it.
  lost-found: use fsck-objects --full
  Teach git-http-fetch the --stdin switch
  Teach git-local-fetch the --stdin switch
  Make pull() support fetching multiple targets at once
  ...

18 years agoread-tree: move merge functions to the library
Johannes Schindelin [Sun, 30 Jul 2006 18:26:15 +0000 (20:26 +0200)]
read-tree: move merge functions to the library

This will allow merge-recursive to use the read-tree functionality
without exec()ing git-read-tree.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-trees: refactor the unpack_trees() part
Johannes Schindelin [Sun, 30 Jul 2006 18:25:18 +0000 (20:25 +0200)]
read-trees: refactor the unpack_trees() part

Basically, the options are passed by a struct unpack_trees_options now.
That's all.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: illustrate an obscure feature better
Johannes Schindelin [Mon, 31 Jul 2006 00:26:27 +0000 (02:26 +0200)]
tar-tree: illustrate an obscure feature better

Since you can tar just a subdirectory of a certain revision, tell
the users so, by showing an example how to do it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.c: allow alias expansion without a git directory
Matthias Lederhofer [Sun, 30 Jul 2006 01:30:29 +0000 (03:30 +0200)]
git.c: allow alias expansion without a git directory

With this, the configuration mechanism can be used to say:

[alias]
init = init-db --template=/path/to/template

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosetup_git_directory_gently: do not barf when GIT_DIR is given.
Matthias Lederhofer [Sun, 30 Jul 2006 01:30:29 +0000 (03:30 +0200)]
setup_git_directory_gently: do not barf when GIT_DIR is given.

Earlier we barfed when GIT_DIR environment variable points at a
directory yet to be created, which made it impossible to use
configuration mechanism in "git-init-db".

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: fix thinko in unique_path()
Johannes Schindelin [Sun, 30 Jul 2006 16:35:21 +0000 (18:35 +0200)]
merge-recur: fix thinko in unique_path()

This could result in a nasty infinite loop, or in bogus names (it used
the strlen() of the newly allocated buffer instead of the original
buffer).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuild on Debian GNU/kFreeBSD
Gerrit Pape [Sat, 29 Jul 2006 16:26:18 +0000 (16:26 +0000)]
Build on Debian GNU/kFreeBSD

Patch from Petr Salinger to make the build process detect and support the
Debian GNU/kFreeBSD architecture, see
 http://bugs.debian.org/380209

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/web'
Junio C Hamano [Sun, 30 Jul 2006 20:35:08 +0000 (13:35 -0700)]
Merge branch 'lt/web'

* lt/web:
  gitweb.cgi: git_blame2: slight optimization reading the blame lines
  gitweb.cgi: git_blame2: Revision blocks now have alternating colors
  gitweb.cgi: git_blame2: Allow back-trekking through commits
  gitweb.cgi: git_blame2: an alternative simple working git blame

18 years agoMerge branch '__/setup-n-mv'
Junio C Hamano [Sun, 30 Jul 2006 20:34:52 +0000 (13:34 -0700)]
Merge branch '__/setup-n-mv'

* __/setup-n-mv:
  Call setup_git_directory() much earlier
  Call setup_git_directory() early

18 years agoMerge branch 'js/mv'
Junio C Hamano [Sun, 30 Jul 2006 20:24:48 +0000 (13:24 -0700)]
Merge branch 'js/mv'

* js/mv:
  builtin git-mv: support moving directories
  Make git-mv a builtin
  Extract helper bits from c-merge-recursive work

18 years agoMerge branch 'jn/make'
Junio C Hamano [Sun, 30 Jul 2006 20:24:29 +0000 (13:24 -0700)]
Merge branch 'jn/make'

* jn/make:
  Set datarootdir in config.mak.in
  Quote all calls to GIT_CONF_APPEND_LINE
  Typofix in configure.ac comment.
  configure.ac vertical whitespace usage cleanup
  autoconf: Checks for some programs
  autoconf: Checks for libraries
  autoconf: Checks for some library functions.
  autoconf: Checks for typedefs, structures, and compiler characteristics.
  autoconf: Preparing the way for autodetection
  Copy description of build configuration variables to configure.ac
  Teach make clean about configure and autoconf
  autoconf: Use autoconf to write installation directories to config.mak.autogen

18 years agoMerge branch 'lt/setup' into __/setup-n-mv
Junio C Hamano [Sat, 29 Jul 2006 08:54:54 +0000 (01:54 -0700)]
Merge branch 'lt/setup' into __/setup-n-mv

This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCall setup_git_directory() much earlier
Linus Torvalds [Sat, 29 Jul 2006 05:44:25 +0000 (22:44 -0700)]
Call setup_git_directory() much earlier

This changes the calling convention of built-in commands and
passes the "prefix" (i.e. pathname of $PWD relative to the
project root level) down to them.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCall setup_git_directory() early
Linus Torvalds [Sat, 29 Jul 2006 04:21:48 +0000 (21:21 -0700)]
Call setup_git_directory() early

Any git command that expects to work in a subdirectory of a project, and
that reads the git config files (which is just about all of them) needs to
make sure that it does the "setup_git_directory()" call before it tries to
read the config file.

This means, among other things, that we need to move the call out of
"init_revisions()", and into the caller.

This does the mostly trivial conversion to do that.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDisplay an error from update-ref if target ref name is invalid.
Shawn Pearce [Sat, 29 Jul 2006 03:44:51 +0000 (23:44 -0400)]
Display an error from update-ref if target ref name is invalid.

Alex Riesen (raa.lkml@gmail.com) recently observed that git branch
would fail with no error message due to unexpected situations with
regards to refs.  For example, if .git/refs/heads/gu is a file but
"git branch -b refs/heads/gu/fixa HEAD" was invoked by the user
it would fail silently due to refs/heads/gu being a file and not
a directory.

This change adds a test for trying to create a ref within a directory
that is actually currently a file, and adds error printing within
the ref locking routine should the resolve operation fail.

The error printing code probably belongs at this level of the library
as other failures within the ref locking, writing and logging code
are also currently at this level of the code.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix http-fetch
Johannes Schindelin [Sat, 29 Jul 2006 00:10:07 +0000 (02:10 +0200)]
Fix http-fetch

With the latest changes in fetch.c, http-fetch crashed accessing
write_ref[i], where write_ref was NULL.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/multi-fetch'
Junio C Hamano [Fri, 28 Jul 2006 20:25:20 +0000 (13:25 -0700)]
Merge branch 'pb/multi-fetch'

* pb/multi-fetch:
  Teach git-http-fetch the --stdin switch
  Teach git-local-fetch the --stdin switch
  Make pull() support fetching multiple targets at once
  Make pull() take some implicit data as explicit arguments

18 years agoMerge branch 'lt/web'
Junio C Hamano [Fri, 28 Jul 2006 20:19:38 +0000 (13:19 -0700)]
Merge branch 'lt/web'

18 years agoMerge branch 'js/cvs'
Junio C Hamano [Fri, 28 Jul 2006 20:18:19 +0000 (13:18 -0700)]
Merge branch 'js/cvs'

* js/cvs:
  cvsserver: imitate git-update-ref when committing

18 years agoMerge branch 'js/alias-p'
Junio C Hamano [Fri, 28 Jul 2006 19:33:57 +0000 (12:33 -0700)]
Merge branch 'js/alias-p'

* js/alias-p:
  git wrapper: add --git-dir=<path> and --bare options
  Allow an alias to start with "-p"

18 years agoMerge branch 'jc/diff'
Junio C Hamano [Fri, 28 Jul 2006 19:23:52 +0000 (12:23 -0700)]
Merge branch 'jc/diff'

* jc/diff:
  git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"

18 years agot4103: fix binary patch application test.
Junio C Hamano [Fri, 28 Jul 2006 19:23:28 +0000 (12:23 -0700)]
t4103: fix binary patch application test.

The generated binary patch was _not_ binary -- earlier I made
the --full-index flag to imply binary patch generation to the diff
machinery, but later we made it independent from --binary (although
the latter implies the former).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply -R: binary patches are irreversible for now.
Junio C Hamano [Fri, 28 Jul 2006 19:21:17 +0000 (12:21 -0700)]
git-apply -R: binary patches are irreversible for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach git-apply about '-R'
Johannes Schindelin [Fri, 28 Jul 2006 15:46:11 +0000 (17:46 +0200)]
Teach git-apply about '-R'

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: ssh-pull.o depends on ssh-fetch.c
Johannes Schindelin [Fri, 28 Jul 2006 09:17:46 +0000 (11:17 +0200)]
Makefile: ssh-pull.o depends on ssh-fetch.c

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolog and diff family: honor config even from subdirectories
Junio C Hamano [Fri, 28 Jul 2006 05:55:44 +0000 (22:55 -0700)]
log and diff family: honor config even from subdirectories

There currently is an unfortunate circular dependency between
what init_revisions (the command line revision specification
parser) does and setting up the log and diff options.  The
function uses setup_git_directory() to find the root of the
project relative to the current directory and calls diff_setup()
to prepare diff generation.  However, some of the things that
diff_setup() does needs to depend on the configuration variable,
which needs to be read after setup_git_directory() is called.

This patch is a low impact workaround.  It first lets
init_revisions() to run and do its thing, then uses git_config()
and diff_setup() after it returns, so that configuration
variables that affects the diff operation can be used from
subdirectories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-reset: detect update-ref error and report it.
Junio C Hamano [Fri, 28 Jul 2006 05:27:44 +0000 (22:27 -0700)]
git-reset: detect update-ref error and report it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolost-found: use fsck-objects --full
Junio C Hamano [Fri, 28 Jul 2006 05:15:01 +0000 (22:15 -0700)]
lost-found: use fsck-objects --full

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: git-merge-recur depends on xdiff libraries.
Junio C Hamano [Fri, 28 Jul 2006 05:02:45 +0000 (22:02 -0700)]
Makefile: git-merge-recur depends on xdiff libraries.

Tighten dependencies to allow parallel build.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: Explain why sha_eq() and struct stage_data cannot go
Johannes Schindelin [Thu, 27 Jul 2006 17:14:17 +0000 (19:14 +0200)]
merge-recur: Explain why sha_eq() and struct stage_data cannot go

There were two TODOs to remove sha_eq() and to convert users of
struct stage_data to active_cache users, but this is not possible.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: Cleanup last mixedCase variables...
Johannes Schindelin [Thu, 27 Jul 2006 17:13:47 +0000 (19:13 +0200)]
merge-recur: Cleanup last mixedCase variables...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: Fix compiler warning with -pedantic
Johannes Schindelin [Thu, 27 Jul 2006 17:13:24 +0000 (19:13 +0200)]
merge-recur: Fix compiler warning with -pedantic

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: Remove dead code
Johannes Schindelin [Thu, 27 Jul 2006 17:13:08 +0000 (19:13 +0200)]
merge-recur: Remove dead code

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: Get rid of debug code
Johannes Schindelin [Thu, 27 Jul 2006 17:12:51 +0000 (19:12 +0200)]
merge-recur: Get rid of debug code

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomerge-recur: Convert variable names to lower_case
Johannes Schindelin [Thu, 27 Jul 2006 17:12:29 +0000 (19:12 +0200)]
merge-recur: Convert variable names to lower_case

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCumulative update of merge-recursive in C
Johannes Schindelin [Thu, 27 Jul 2006 11:17:07 +0000 (13:17 +0200)]
Cumulative update of merge-recursive in C

This contains mainly three sorts of fixes:

- get rid of small wrapper functions
- reuse the diff_filespec structure when sha1, mode & path are needed
- Junio's pedantic updates

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach git-http-fetch the --stdin switch
Petr Baudis [Thu, 27 Jul 2006 21:56:22 +0000 (23:56 +0200)]
Teach git-http-fetch the --stdin switch

Speeds up things quite a lot when fetching tags with Cogito.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach git-local-fetch the --stdin switch
Petr Baudis [Thu, 27 Jul 2006 21:56:19 +0000 (23:56 +0200)]
Teach git-local-fetch the --stdin switch

This makes it possible to fetch many commits (refs) at once, greatly
speeding up cg-clone.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pull() support fetching multiple targets at once
Petr Baudis [Thu, 27 Jul 2006 21:56:17 +0000 (23:56 +0200)]
Make pull() support fetching multiple targets at once

pull() now takes an array of arguments instead of just one of each kind.
Currently, no users use the new capability, but that'll change.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pull() take some implicit data as explicit arguments
Petr Baudis [Thu, 27 Jul 2006 21:56:14 +0000 (23:56 +0200)]
Make pull() take some implicit data as explicit arguments

Currently it's a bit weird that pull() takes a single argument
describing the commit but takes the write_ref from a global variable.
This makes it take that as a parameter as well, which might be nicer
for the libification in the future, but especially it will make for
nicer code when we implement pull()ing multiple commits at once.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomailinfo: accept >From in message header
Michael S. Tsirkin [Thu, 27 Jul 2006 14:03:43 +0000 (17:03 +0300)]
mailinfo: accept >From in message header

Mail I get sometimes has multiple From lines, like this:

    From Majordomo@vger.kernel.org  Thu Jul 27 16:39:36 2006
    >From mtsirkin  Thu Jul 27 16:39:36 2006
    Received: from yok.mtl.com [10.0.8.11]
    ...

which confuses git-mailinfo since that does not recognize >From
as a valid header line.

This patch makes it recognize >From XXX as a valid header line.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove -d from *-fetch usage strings
Petr Baudis [Thu, 27 Jul 2006 18:58:53 +0000 (20:58 +0200)]
Remove -d from *-fetch usage strings

This is a really ancient remnant of the short era of delta objects stored
directly in the object database.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: documentation for --reuseaddr, --detach and --pid-file
Matthias Lederhofer [Fri, 14 Jul 2006 15:53:29 +0000 (17:53 +0200)]
daemon: documentation for --reuseaddr, --detach and --pid-file

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: imitate git-update-ref when committing
Johannes Schindelin [Wed, 26 Jul 2006 20:51:52 +0000 (22:51 +0200)]
cvsserver: imitate git-update-ref when committing

git-update-ref writes into the lockfile, and renames it afterwards. Like
commit v1.3.0-rc3~22, it is not only cleaner, but also helps with shared
setups: every developer can have a different primary group; what matters
is that $GIT_DIR/refs/heads has to be writable by a group you are in.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoinstaweb: Be more clear if httpd or the browser fail
Johannes Schindelin [Wed, 26 Jul 2006 21:11:46 +0000 (23:11 +0200)]
instaweb: Be more clear if httpd or the browser fail

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin git-mv: support moving directories
Johannes Schindelin [Wed, 26 Jul 2006 17:47:54 +0000 (19:47 +0200)]
builtin git-mv: support moving directories

This fixes the builtin mv for the test which Josef provided, and also
fixes moving directories into existing directories, as noted by Jon Smirl.
In case the destination exists, fail early (this cannot be overridden
by -f).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake git-mv a builtin
Johannes Schindelin [Wed, 26 Jul 2006 01:52:35 +0000 (03:52 +0200)]
Make git-mv a builtin

This also moves add_file_to_index() to read-cache.c. Oh, and while
touching builtin-add.c, it also removes a duplicate git_config() call.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoExtract helper bits from c-merge-recursive work
Johannes Schindelin [Wed, 26 Jul 2006 04:32:18 +0000 (21:32 -0700)]
Extract helper bits from c-merge-recursive work

This backports the pieces that are not uncooked from the merge-recursive
WIP we have seen earlier, to be used in git-mv rewritten in C.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/configure'
Junio C Hamano [Wed, 26 Jul 2006 20:35:35 +0000 (13:35 -0700)]
Merge branch 'pb/configure'

* pb/configure:
  Rename man1 and man7 variables to man1dir and man7dir
  Allow INSTALL, bindir, mandir to be set in main Makefile

18 years agogit-cvsserver: support multiline commit messages
Johannes Schindelin [Wed, 26 Jul 2006 19:59:08 +0000 (21:59 +0200)]
git-cvsserver: support multiline commit messages

Earlier, cvsserver barfed when you tried to check in files with a
multiline commit message.

That is what Argumentx is for... Argument: lines can be followed by
several Argumentx: lines, which means they should be appended.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot7001: add test for git-mv dir1 dir2/
Johannes Schindelin [Wed, 26 Jul 2006 17:41:05 +0000 (19:41 +0200)]
t7001: add test for git-mv dir1 dir2/

If dir2 already exists, git-mv should move dir1 _into_dir2/.
Noticed by Jon Smirl.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: fix two warnings
Johannes Schindelin [Wed, 26 Jul 2006 14:58:35 +0000 (16:58 +0200)]
gitweb: fix two warnings

These warnings cluttered up my log.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-instaweb: respect bindir from Makefile
Johannes Schindelin [Wed, 26 Jul 2006 14:32:51 +0000 (16:32 +0200)]
git-instaweb: respect bindir from Makefile

Not everybody installs git to /usr/bin/git.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-instaweb: some Apache have mod_cgi builtin
Johannes Schindelin [Wed, 26 Jul 2006 14:33:18 +0000 (16:33 +0200)]
git-instaweb: some Apache have mod_cgi builtin

So test for it, and do not always try to load mod_cgi.o.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4112: simplify the test and remove unneeded working tree file.
Junio C Hamano [Wed, 26 Jul 2006 18:01:07 +0000 (11:01 -0700)]
t4112: simplify the test and remove unneeded working tree file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoExtend testing git-mv for renaming of subdirectories
Josef Weidendorfer [Wed, 26 Jul 2006 13:44:08 +0000 (15:44 +0200)]
Extend testing git-mv for renaming of subdirectories

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit wrapper: add --git-dir=<path> and --bare options
Johannes Schindelin [Tue, 25 Jul 2006 18:24:22 +0000 (20:24 +0200)]
git wrapper: add --git-dir=<path> and --bare options

With this, you can say

git --bare repack -a -d

inside a bare repository, and it will actually work. While at it,
also move the --version, --help and --exec-path options to the
handle_options() function.

While at documenting the new options, also document the --paginate
option.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAllow an alias to start with "-p"
Johannes Schindelin [Mon, 24 Jul 2006 12:10:45 +0000 (14:10 +0200)]
Allow an alias to start with "-p"

Now, something like

[alias]
pd = -p diff

works as expected.

[jc: a follow-up fix from Jeff King folded in.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: avoid warning about active db handles v1.4.2-rc2
Johannes Schindelin [Tue, 25 Jul 2006 11:57:57 +0000 (13:57 +0200)]
cvsserver: avoid warning about active db handles

Turns out that DBD::SQLite does not favour preparing statements which are
never executed. So, turn all 4 statements, which were prepared _always_,
into methods, like the other 12 prepared statements.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: suppress warnings
Johannes Schindelin [Tue, 25 Jul 2006 10:48:52 +0000 (12:48 +0200)]
cvsserver: suppress warnings

This patch defines $state->{prependdir} as the empty string, so that
quite a few warnings are avoided.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSubstitute xmalloc()+memset(0) with xcalloc().
Peter Eriksen [Tue, 25 Jul 2006 07:30:18 +0000 (09:30 +0200)]
Substitute xmalloc()+memset(0) with xcalloc().

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: escape tag comments
Daniel Drake [Mon, 24 Jul 2006 22:07:23 +0000 (23:07 +0100)]
gitweb: escape tag comments

I have a tag with a comment which includes an & character. Firefox wouldn't
display my gitweb summary page due to malformed XML. This solves the problem.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/clone-bind-failure'
Junio C Hamano [Tue, 25 Jul 2006 20:19:54 +0000 (13:19 -0700)]
Merge branch 'jc/clone-bind-failure'

* jc/clone-bind-failure:
  fetch/clone: check return status from ls-remote

18 years agoMerge branch 'jt/format-patch'
Junio C Hamano [Tue, 25 Jul 2006 19:54:57 +0000 (12:54 -0700)]
Merge branch 'jt/format-patch'

* jt/format-patch:
  builtin-log: typefix for recent format-patch changes.
  Add option to set initial In-Reply-To/References
  Add option to enable threading headers
  git-format-patch: Make the second and subsequent mails replies to the first

18 years agoMerge branch 'ew/apply'
Junio C Hamano [Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)]
Merge branch 'ew/apply'

* ew/apply:
  Fix t4114 on cygwin
  apply: handle type-changing patch correctly.
  apply: split out removal and creation into different phases.
  apply: check D/F conflicts more carefully.
  typechange tests for git apply (currently failing)

18 years agoMerge branch 'jc/read-tree'
Junio C Hamano [Tue, 25 Jul 2006 04:01:14 +0000 (21:01 -0700)]
Merge branch 'jc/read-tree'

* jc/read-tree:
  checkout -f failed to check out a file if an existing directory interfered.

18 years agogitweb.cgi: git_blame2: slight optimization reading the blame lines
Luben Tuikov [Sun, 23 Jul 2006 21:17:48 +0000 (14:17 -0700)]
gitweb.cgi: git_blame2: slight optimization reading the blame lines

Eliminate git_read_blame_line() -- move that code inline and
optimize it.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: Centralize printing of the page path
Luben Tuikov [Sun, 23 Jul 2006 20:31:15 +0000 (13:31 -0700)]
gitweb.cgi: Centralize printing of the page path

Centralize printing of the page path so that
if the entity is a blob, we can set the page path
to be the link to the HEAD revision of the
"raw" blob.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: git_blame2: Revision blocks now have alternating colors
Luben Tuikov [Sun, 23 Jul 2006 20:37:53 +0000 (13:37 -0700)]
gitweb.cgi: git_blame2: Revision blocks now have alternating colors

A revision block is the largest number of adjacent
lines of code originating from the same revision.

This patch adds color to git_blame2(), in that no two
adjacent revision blocks have the same color.  The color
alternates between light and dark.

As we annotate the code lines, we alternate the color
(light, dark) of code lines _per revision_.  This makes it
easier to see line conglomerations per revision.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: Show "raw" head of project link even when $hash is not defined
Luben Tuikov [Sun, 23 Jul 2006 20:30:08 +0000 (13:30 -0700)]
gitweb.cgi: Show "raw" head of project link even when $hash is not defined

Some callers of git_history() do not set $hash of $file_name.
Add code to find it, if it is not defined.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: git_blame2: Allow back-trekking through commits
Luben Tuikov [Sun, 23 Jul 2006 20:36:32 +0000 (13:36 -0700)]
gitweb.cgi: git_blame2: Allow back-trekking through commits

This patch adds the capability of back-trekking through
commits from git_blame2() as follows:
blame2->commit->blame2->commit->blame2->...->initial commit.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: git_blame2: an alternative simple working git blame
Luben Tuikov [Sun, 23 Jul 2006 20:34:55 +0000 (13:34 -0700)]
gitweb.cgi: git_blame2: an alternative simple working git blame

This patch adds an alternative simple working git-blame
called git_blame2().  Simple, because it displays just
three columns: the commit, the line number and the line
of code.  Alternative, because the original git_blame()
is left untouched.  Lines of code are printed html
escaped, but as-is.

git_blame2() uses git-blame as opposed to git-annotate
used by git_blame().

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: Include direct link to "raw" files from "history"
Luben Tuikov [Sun, 23 Jul 2006 20:28:55 +0000 (13:28 -0700)]
gitweb.cgi: Include direct link to "raw" files from "history"

In "history" view, the "page_path" is now also a URL link to
the "raw" format of the file, which will always give you
the latest version in the repository.

This is helpful for externally linking files, such that
the latest version is always referenced and in "raw" format.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb.cgi: Teach git_history() to read hash from $hash_base
Luben Tuikov [Sun, 23 Jul 2006 20:26:30 +0000 (13:26 -0700)]
gitweb.cgi: Teach git_history() to read hash from $hash_base

Teach git_history() to take its hash argument from
the hb parameter, i.e. from $hash_base.  Also change
all "a=history" actions to pass "hb=" instead of "h=".

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'lt/objformat'
Junio C Hamano [Tue, 25 Jul 2006 00:38:03 +0000 (17:38 -0700)]
Merge branch 'lt/objformat'

* lt/objformat:
  sha1_file: add the ability to parse objects in "pack file format"

18 years agoTrivial path optimization test
Alex Riesen [Mon, 24 Jul 2006 23:23:03 +0000 (01:23 +0200)]
Trivial path optimization test

Linus:
    get_pathspec() does turn '.' into an empty string (which is
    correct - git internally does _not_ ever understand the notion of
    "." as the current working directory), but it doesn't ever do the
    optimization of noticing that a pathspec that consists solely of
    an empty string is "equivalent" to an empty pathspec.

The test is to ensure that this behaviour stays.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAlways reset the color _before_ printing out the newline
Johannes Schindelin [Mon, 24 Jul 2006 12:41:41 +0000 (14:41 +0200)]
Always reset the color _before_ printing out the newline

This patch brings the benefits of part of v1.4.1-rc2~37
to the "commit" colorizing patch.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoupload-pack: fix timeout in create_pack_file
Matthias Lederhofer [Tue, 18 Jul 2006 17:14:51 +0000 (19:14 +0200)]
upload-pack: fix timeout in create_pack_file

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDefaulting fetch to origin when set in the repo-config
Santi Béjar [Sat, 22 Jul 2006 22:54:40 +0000 (00:54 +0200)]
Defaulting fetch to origin when set in the repo-config

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoColorize 'commit' lines in log ui
Jeff King [Sun, 23 Jul 2006 09:24:18 +0000 (05:24 -0400)]
Colorize 'commit' lines in log ui

When paging through the output of git-whatchanged, the color cues help to
visually navigate within a diff. However, it is difficult to notice when a
new commit starts, because the commit and log are shown in the "normal"
color. This patch colorizes the 'commit' line, customizable through
diff.colors.commit and defaulting to yellow.

As a side effect, some of the diff color engine (slot enum, get_color) has
become accessible outside of diff.c.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-am: Don't accept an mbox on stdin of we already have a .dotest directory
Lukas Sandström [Wed, 19 Jul 2006 20:28:00 +0000 (22:28 +0200)]
git-am: Don't accept an mbox on stdin of we already have a .dotest directory

It makes no sense to accept an mbox via stdin when we
won't accept it on the commandline.

The patch helps the following scenario:

# git init-db
"add file1 with content"
# git checkout -b apply
"edit file1 && commit"

# git checkout -b conflict master
"edit file1 && commit"

# git checkout -b ok master
"add file2"

# git checkout apply
# git format-patch -k -3 master..conflict | git am -k -3
=> git-am fails with a conflict message
# git reset --hard

# git format-patch -k -3 master..ok | git am -k -3
=> git am fails with the same conflict message as above,
=> since it's trying to apply the old .dotest directory

With the patch it complains about an old .dotest
directory instead.

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoshow-branch: Fix another performance problem.
Alexandre Julliard [Sun, 23 Jul 2006 17:51:04 +0000 (19:51 +0200)]
show-branch: Fix another performance problem.

When naming commits, stop walking the parent chain as soon as we find
a commit that already has a name. The parent chain of that commit will
be walked later on in any case (or may even have been walked already).
This avoids O(n^2) behavior; on a tree where show-branch displays 6800
commits, the total run time drops from 77 seconds to 5 seconds.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopack-objects: check pack.window for default window size
Jeff King [Sun, 23 Jul 2006 05:50:30 +0000 (01:50 -0400)]
pack-objects: check pack.window for default window size

For some repositories, deltas simply don't make sense. One can disable
them for git-repack by adding --window, but git-push insists on making
the deltas which can be very CPU-intensive for little benefit.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDisable linking with Fink or DarwinPorts.
Shawn Pearce [Mon, 24 Jul 2006 04:28:28 +0000 (00:28 -0400)]
Disable linking with Fink or DarwinPorts.

It may be desirable for the compiler to disable linking against Fink
or DarwinPorts, especially if both are installed on the system and
the user wants GIT to be linked specifically to only one of them.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Put the git customize group in the 'tools' parent group.
Alexandre Julliard [Sat, 22 Jul 2006 13:40:13 +0000 (15:40 +0200)]
git.el: Put the git customize group in the 'tools' parent group.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Try to reuse an existing buffer when running git-status.
Alexandre Julliard [Sat, 22 Jul 2006 13:39:53 +0000 (15:39 +0200)]
git.el: Try to reuse an existing buffer when running git-status.

By default, running git-status again will now reuse an existing buffer
that displays the same directory. The old behavior of always creating
a new buffer can be obtained by customizing the git-reuse-status-buffer
option.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Prepend a slash to the file name when adding to .gitignore.
Alexandre Julliard [Sat, 22 Jul 2006 13:39:32 +0000 (15:39 +0200)]
git.el: Prepend a slash to the file name when adding to .gitignore.

This way the ignore command will really only ignore the marked files
and not files with the same name in subdirectories.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.el: Run git-rerere on commits if the rr-cache directory exists.
Alexandre Julliard [Sat, 22 Jul 2006 13:39:02 +0000 (15:39 +0200)]
git.el: Run git-rerere on commits if the rr-cache directory exists.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix fetching new directories copies when using SVN:: libs
Eric Wong [Thu, 20 Jul 2006 08:43:01 +0000 (01:43 -0700)]
git-svn: fix fetching new directories copies when using SVN:: libs

Log output from SVN doesn't list all the new files that were
added if a new directory was copied from an existing place in
the repository.  This means we'll have to do some extra work and
traverse new directories ourselves.

This has been updated from the original patch to defer traversed
adds until all removals have been done.  Please disregard the
original.

Thanks to Ben Williamson for the excellent bug report and
testing.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotar-tree: add the "tar.umask" config option
Willy Tarreau [Thu, 20 Jul 2006 09:30:44 +0000 (11:30 +0200)]
tar-tree: add the "tar.umask" config option

By default, git-tar-tree(1) sets file and directories modes to 0666
or 0777. While this is both useful and acceptable for projects such
as the Linux Kernel, it might be excessive for other projects. With
this variable, it becomes possible to tell git-tar-tree(1) to apply
a specific umask to the modes above. The special value "user"
indicates that the user's current umask will be used. This should be
enough for most projects, as it will lead to the same permissions as
git-checkout(1) would use. The default value remains 0, which means
world read-write.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix t4114 on cygwin
Johannes Schindelin [Tue, 18 Jul 2006 17:46:34 +0000 (19:46 +0200)]
Fix t4114 on cygwin

On cygwin, when you try to create a symlink over a directory, you do
not get EEXIST, but EACCES.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsexportcommit - add -a (add author line) flag, cleanup warnings
Martin Langhoff [Tue, 18 Jul 2006 02:22:49 +0000 (14:22 +1200)]
cvsexportcommit - add -a (add author line) flag, cleanup warnings

This patch adds support for -a which will add an "Author: " line, and possibly
a "Committer: " line to the bottom of the commit message for CVS.

The commit message parser is now a little bit better, and some warnings
have been cleaned up.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agounpack-objects: remove stale and confusing comment
Junio C Hamano [Mon, 17 Jul 2006 20:08:14 +0000 (13:08 -0700)]
unpack-objects: remove stale and confusing comment

The very initial version of unpack-objects.c::unpack_all() used
to unpack from the end of the pack, but since end of June last
year it was changed to stream from the front and the comment
does not reflect the reality anymore.

Signed-off-by: Junio C Hamano <junkio@cox.net>