Code

git.git
18 years agoMerge branch 'jc/diff-test' into th/diff
Junio C Hamano [Thu, 29 Jun 2006 07:30:57 +0000 (00:30 -0700)]
Merge branch 'jc/diff-test' into th/diff

* jc/diff-test:
  t4013: add format-patch tests.

18 years agot4013: add format-patch tests.
Junio C Hamano [Thu, 29 Jun 2006 07:01:07 +0000 (00:01 -0700)]
t4013: add format-patch tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoformat-patch: fix diff format option implementation
Junio C Hamano [Thu, 29 Jun 2006 07:18:52 +0000 (00:18 -0700)]
format-patch: fix diff format option implementation

The updates forgot to make the diff go recursive.

18 years agoMerge branch 'jc/diff-test-updates' into th/diff
Junio C Hamano [Wed, 28 Jun 2006 11:02:46 +0000 (04:02 -0700)]
Merge branch 'jc/diff-test-updates' into th/diff

* jc/diff-test-updates:
  t4013 test updates for new output code.

18 years agocombine-diff.c: type sanity.
Junio C Hamano [Wed, 28 Jun 2006 08:46:41 +0000 (01:46 -0700)]
combine-diff.c: type sanity.

In diff_tree_combined(), show_log_first boolean is initialized with
rev->loginfo (pointer to a string); the intention is that if we have
some string to be emitted we would want to remember that fact.  Picky
compilers are offended by this, so make the expression a bit type-safer.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4013 test updates for new output code.
Junio C Hamano [Tue, 27 Jun 2006 22:36:19 +0000 (15:36 -0700)]
t4013 test updates for new output code.

These are updates to the test vector that shows the "incompatibility" of
the new output code.  The changes are actually the good ones, so instead
of keeping the older output we adjust the test to the new code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix some more diff options changes.
Junio C Hamano [Tue, 27 Jun 2006 22:08:19 +0000 (15:08 -0700)]
Fix some more diff options changes.

This fixes various problems in the new diff options code.

 - Fix --cc/-c --patch; it showed two-tree diff used internally.

 - Use "---\n" only where it matters -- that is, use it
   immediately after the commit log text when we show a
   commit log and something else before the patch text.

 - Do not output spurious extra "\n"; have an extra newline
   after the commit log text always when we have diff output and
   we are not doing oneline.

 - When running a pickaxe you need to go recursive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/diff-test' into th/diff
Junio C Hamano [Tue, 27 Jun 2006 18:05:02 +0000 (11:05 -0700)]
Merge branch 'jc/diff-test' into th/diff

* jc/diff-test:
  t4013: add more tests around -c and --cc
  t4013: add tests for diff/log family output options.

18 years agoFix diff-tree -s
Timo Hirvonen [Tue, 27 Jun 2006 16:43:22 +0000 (19:43 +0300)]
Fix diff-tree -s

setup_revisions() calls diff_setup_done() before we can set default
value for output_format.  Don't convert DIFF_FORMAT_NO_OUTPUT to 0 in
diff_setup_done(), it is useless and makes diff-tree believe no diff
format parameters were given and thus lets it reset output_format to
DIFF_FORMAT_RAW.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agolog --raw: Don't descend into subdirectories by default
Timo Hirvonen [Tue, 27 Jun 2006 13:27:51 +0000 (16:27 +0300)]
log --raw: Don't descend into subdirectories by default

Only do so when -r is given.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff-tree: Use ---\n as a message separator
Timo Hirvonen [Tue, 27 Jun 2006 12:39:29 +0000 (15:39 +0300)]
diff-tree: Use ---\n as a message separator

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoPrint empty line between raw, stat, summary and patch
Timo Hirvonen [Tue, 27 Jun 2006 12:09:17 +0000 (15:09 +0300)]
Print empty line between raw, stat, summary and patch

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4013: add more tests around -c and --cc
Junio C Hamano [Tue, 27 Jun 2006 06:29:11 +0000 (23:29 -0700)]
t4013: add more tests around -c and --cc

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agowhatchanged: Default to DIFF_FORMAT_RAW
Timo Hirvonen [Sun, 25 Jun 2006 12:39:35 +0000 (15:39 +0300)]
whatchanged: Default to DIFF_FORMAT_RAW

Split cmd_log_wc() to cmd_log_init() and cmd_log_walk() and set default
diff output format for whatchanged to DIFF_FORMAT_RAW.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDon't xcalloc() struct diffstat_t
Timo Hirvonen [Sun, 25 Jun 2006 11:28:19 +0000 (14:28 +0300)]
Don't xcalloc() struct diffstat_t

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd msg_sep to diff_options
Timo Hirvonen [Sun, 25 Jun 2006 10:54:14 +0000 (13:54 +0300)]
Add msg_sep to diff_options

Add msg_sep variable to struct diff_options.  msg_sep is printed after
commit message.  Default is "\n", format-patch sets it to "---\n".

This also removes the second argument from show_log() because all
callers derived it from the first argument:

    show_log(rev, rev->loginfo, ...

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDIFF_FORMAT_RAW is not default anymore
Timo Hirvonen [Sat, 24 Jun 2006 17:25:08 +0000 (20:25 +0300)]
DIFF_FORMAT_RAW is not default anymore

diff_setup() used to initialize output_format to DIFF_FORMAT_RAW.  Now
the default is 0 (no output) so don't compare against DIFF_FORMAT_RAW to
see if any diff format command line flags were given.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSet default diff output format after parsing command line
Timo Hirvonen [Sat, 24 Jun 2006 17:24:14 +0000 (20:24 +0300)]
Set default diff output format after parsing command line

Initialize output_format to 0 instead of DIFF_FORMAT_RAW so that we can see
later if any command line options changed it.  Default value is set only if
output format was not specified.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake --raw option available for all diff commands
Timo Hirvonen [Sat, 24 Jun 2006 17:23:06 +0000 (20:23 +0300)]
Make --raw option available for all diff commands

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge with_raw, with_stat and summary variables to output_format
Timo Hirvonen [Sat, 24 Jun 2006 17:21:53 +0000 (20:21 +0300)]
Merge with_raw, with_stat and summary variables to output_format

DIFF_FORMAT_* are now bit-flags instead of enumerated values.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4013: add tests for diff/log family output options.
Junio C Hamano [Mon, 26 Jun 2006 20:46:52 +0000 (13:46 -0700)]
t4013: add tests for diff/log family output options.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/squash'
Junio C Hamano [Mon, 26 Jun 2006 21:36:10 +0000 (14:36 -0700)]
Merge branch 'jc/squash'

* jc/squash:
  git-merge --squash

18 years agoMerge branch 'jc/diff'
Junio C Hamano [Mon, 26 Jun 2006 21:36:02 +0000 (14:36 -0700)]
Merge branch 'jc/diff'

* jc/diff:
  diff --color: use $GIT_DIR/config

18 years agoMerge branch 'ml/cvsimport'
Junio C Hamano [Mon, 26 Jun 2006 21:35:33 +0000 (14:35 -0700)]
Merge branch 'ml/cvsimport'

* ml/cvsimport:
  cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
  cvsimport: setup indexes correctly for ancestors and incremental imports

18 years agoMerge branch 'js/diff'
Junio C Hamano [Mon, 26 Jun 2006 21:28:42 +0000 (14:28 -0700)]
Merge branch 'js/diff'

* js/diff:
  Teach diff about -b and -w flags

18 years agoMerge branch 'ew/rebase'
Junio C Hamano [Mon, 26 Jun 2006 21:05:13 +0000 (14:05 -0700)]
Merge branch 'ew/rebase'

* ew/rebase:
  rebase: allow --skip to work with --merge
  rebase: cleanup rebasing with --merge
  rebase: allow --merge option to handle patches merged upstream

18 years agoFix pkt-line.h to compile with a non-GCC compiler
Dennis Stosberg [Mon, 26 Jun 2006 08:27:07 +0000 (10:27 +0200)]
Fix pkt-line.h to compile with a non-GCC compiler

pkt-line.h uses GCC's __attribute__ extension but does not include
git-compat-util.h.  So it will not compile with a compiler that does
not support this extension.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSolaris needs inclusion of signal.h for signal()
Dennis Stosberg [Mon, 26 Jun 2006 08:26:13 +0000 (10:26 +0200)]
Solaris needs inclusion of signal.h for signal()

Currently the compilation fails in connect.c and merge-index.c

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocorrect documentation for git grep
Matthias Lederhofer [Sun, 25 Jun 2006 16:07:15 +0000 (18:07 +0200)]
correct documentation for git grep

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff --color: use $GIT_DIR/config
Junio C Hamano [Sat, 24 Jun 2006 11:06:23 +0000 (04:06 -0700)]
diff --color: use $GIT_DIR/config

This lets you use something like this in your $GIT_DIR/config
file.

[diff]
color = auto

[diff.color]
new = blue
old = yellow
frag = reverse

When diff.color is set to "auto", colored diff is enabled when
the standard output is the terminal.  Other choices are "always",
and "never".  Usual boolean true/false can also be used.

The colormap entries can specify colors for the following slots:

plain - lines that appear in both old and new file (context)
meta - diff --git header and extended git diff headers
frag - @@ -n,m +l,k @@ lines (hunk header)
old - lines deleted from old file
new - lines added to new file

The following color names can be used:

normal, bold, dim, l, blink, reverse, reset,
black, red, green, yellow, blue, magenta, cyan,
white

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase: allow --skip to work with --merge
Eric Wong [Sun, 25 Jun 2006 01:29:49 +0000 (18:29 -0700)]
rebase: allow --skip to work with --merge

Now that we control the merge base selection, we won't be forced
into rolling things in that we wanted to skip beforehand.

Also, add a test to ensure this all works as intended.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase: cleanup rebasing with --merge
Eric Wong [Sun, 25 Jun 2006 01:29:48 +0000 (18:29 -0700)]
rebase: cleanup rebasing with --merge

We no longer have to recommit each patch to remove the parent
information we're rebasing since we're using the low-level merge
strategies directly instead of git-merge.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase: allow --merge option to handle patches merged upstream
Eric Wong [Sun, 25 Jun 2006 01:29:47 +0000 (18:29 -0700)]
rebase: allow --merge option to handle patches merged upstream

Enhance t3401-rebase-partial to test with --merge as well as
the standard am -3 strategy.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-commit: filter out log message lines only when editor was run.
Yann Dirson [Fri, 23 Jun 2006 22:04:05 +0000 (00:04 +0200)]
git-commit: filter out log message lines only when editor was run.

The current behaviour strips out lines starting with a # even when fed
through stdin or -m.  This is particularly bad when importing history from
another SCM (tailor 0.9.23 uses git-commit).  In the best cases all lines
are stripped and the commit fails with a confusing "empty log message"
error, but in many cases the commit is done, with loss of information.

Note that it is quite peculiar to just have "#" handled as a leading
comment char here.  One commonly meet CVS: or CG: or STG: as prefixes, and
using GIT: would be more robust as well as consistent with other commit
tools.  However, that would break any tool relying on the # (if any).

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRename safe_strncpy() to strlcpy().
Peter Eriksen [Sat, 24 Jun 2006 14:01:25 +0000 (16:01 +0200)]
Rename safe_strncpy() to strlcpy().

This cleans up the use of safe_strncpy() even more.  Since it has the
same semantics as strlcpy() use this name instead.  Also move the
definition from inside path.c to its own file compat/strlcpy.c, and use
it conditionally at compile time, since some platforms already has
strlcpy().  It's included in the same way as compat/setenv.c.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
Johannes Schindelin [Sat, 24 Jun 2006 20:10:11 +0000 (22:10 +0200)]
apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.

It does not make much sense to build git whose behaviour is
different depending on the brokenness of diff implementation of
the platform because the brokenness of the patch that is applied
with the tool depends on brokenness of the diff the person who
generates the patch uses.  So we do not use NO_ACCURATE_DIFF
anymore, but help people to apply patches that do not record
incomplete lines correctly with a runtime flag.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoClean up diff.c
Timo Hirvonen [Sat, 24 Jun 2006 17:20:32 +0000 (20:20 +0300)]
Clean up diff.c

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
Johannes Schindelin [Sat, 24 Jun 2006 19:42:20 +0000 (21:42 +0200)]
cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}

Also, make sure that the initial git-read-tree is performed.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
18 years agocvsimport: setup indexes correctly for ancestors and incremental imports
Martin Langhoff [Sat, 24 Jun 2006 11:13:08 +0000 (23:13 +1200)]
cvsimport: setup indexes correctly for ancestors and incremental imports

Two bugs had slipped in the "keep one index per branch during import"
patch. Both incremental imports and new branches would see an
empty tree for their initial commit. Now we cover all the relevant
cases, checking whether we actually need to setup the index before
preparing the actual commit, and doing it.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorepo-config: fix printing of bool
Junio C Hamano [Sat, 24 Jun 2006 12:19:30 +0000 (05:19 -0700)]
repo-config: fix printing of bool

When a bool variable appears without any value, it means true.
However, replacing the NULL value with an empty string, an earlier
commit f067a13745fbeae1aa357876348a00e5edd0a629 broke show-config.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff --color: use reset sequence when we mean reset.
Junio C Hamano [Sat, 24 Jun 2006 11:20:39 +0000 (04:20 -0700)]
diff --color: use reset sequence when we mean reset.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-repack -- respect -q and be quiet
Martin Langhoff [Sat, 24 Jun 2006 09:41:25 +0000 (21:41 +1200)]
git-repack -- respect -q and be quiet

git-repack was passing the -q along to pack-objects but ignoring it
itself. Correct the oversight.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-merge --squash
Junio C Hamano [Fri, 23 Jun 2006 08:37:02 +0000 (01:37 -0700)]
git-merge --squash

Some people tend to do many little commits on a topic branch,
recording all the trials and errors, and when the topic is
reasonably cooked well, would want to record the net effect of
the series as one commit on top of the mainline, removing the
cruft from the history.  The topic is then abandoned or forked
off again from that point at the mainline.

The barebone porcelainish that comes with core git tools does
not officially support such operation, but you can fake it by
using "git pull --no-merge" when such a topic branch is not a
strict superset of the mainline, like this:

git checkout mainline
git pull --no-commit . that-topic-branch
: fix conflicts if any
rm -f .git/MERGE_HEAD
        git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged

This however does not work when the topic branch is a fast
forward of the mainline, because normal "git pull" will never
create a merge commit in such a case, and there is nothing
special --no-commit could do to begin with.

This patch introduces a new option, --squash, to support such a
workflow officially in both fast-forward case and true merge
case.  The user-level operation would be the same in both cases:

git checkout mainline
        git pull --squash . that-topic-branch
        : fix conflicts if any -- naturally, there would be
        : no conflict if fast forward.
git commit -a -m  'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged

When the current branch is already up-to-date with respect to
the other branch, there truly is nothing to do, so the new
option does not have any effect.

This was brought up in #git IRC channel recently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-pull: abort when fmt-merge-msg fails.
Junio C Hamano [Sat, 24 Jun 2006 08:10:27 +0000 (01:10 -0700)]
git-pull: abort when fmt-merge-msg fails.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'pb/error'
Junio C Hamano [Sat, 24 Jun 2006 08:06:51 +0000 (01:06 -0700)]
Merge branch 'pb/error'

* pb/error:
  usage: minimum type fix.
  Customizable error handlers
  git-merge: Don't use -p when outputting summary
  git-commit: allow -e option anywhere on command line
  patch-id: take "commit" prefix as well as "diff-tree" prefix

18 years agousage: minimum type fix.
Junio C Hamano [Sat, 24 Jun 2006 05:44:33 +0000 (22:44 -0700)]
usage: minimum type fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCustomizable error handlers
Petr Baudis [Sat, 24 Jun 2006 02:34:38 +0000 (04:34 +0200)]
Customizable error handlers

This patch makes the usage(), die() and error() handlers customizable.
Nothing in the git code itself uses that but many other libgit users
(like Git.pm) will.

This is implemented using the mutator functions primarily because you
cannot directly modifying global variables of libgit from a program that
dlopen()ed it, apparently. But having functions for that is a better API
anyway.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-merge: Don't use -p when outputting summary
Timo Hirvonen [Fri, 23 Jun 2006 21:45:40 +0000 (00:45 +0300)]
git-merge: Don't use -p when outputting summary

-p is not needed and we only want diffstat and summary.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTeach diff about -b and -w flags
Johannes Schindelin [Wed, 14 Jun 2006 15:40:23 +0000 (17:40 +0200)]
Teach diff about -b and -w flags

This adds -b (--ignore-space-change) and -w (--ignore-all-space) flags to
diff. The main part of the patch is teaching libxdiff about it.

[jc: renamed xdl_line_match() to xdl_recmatch() since the former is used
 for different purposes in xpatchi.c which is in the parts of the upstream
 source we do not use.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-commit: allow -e option anywhere on command line
Jeff King [Fri, 23 Jun 2006 13:43:38 +0000 (09:43 -0400)]
git-commit: allow -e option anywhere on command line

Previously, the command 'git-commit -e -m foo' would ignore the '-e' option
because the '-m' option overwrites the no_edit flag during sequential
option parsing. Now we cause -e to reset the no_edit flag after all
options are parsed.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopatch-id: take "commit" prefix as well as "diff-tree" prefix
Johannes Schindelin [Fri, 23 Jun 2006 15:36:21 +0000 (17:36 +0200)]
patch-id: take "commit" prefix as well as "diff-tree" prefix

Some time ago we changed git-log in a massive way, and one consequence is
that the keyword changed. Adjust patch-id for that.

[jc: as Linus suggests, allowing both old and new prefix.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: do not recompile main programs when libraries have changed.
Junio C Hamano [Thu, 22 Jun 2006 22:43:47 +0000 (15:43 -0700)]
Makefile: do not recompile main programs when libraries have changed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd GIT-CFLAGS to .gitignore
Matthias Kestenholz [Thu, 22 Jun 2006 21:06:39 +0000 (23:06 +0200)]
add GIT-CFLAGS to .gitignore

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTweak diff colors
Linus Torvalds [Thu, 22 Jun 2006 20:53:31 +0000 (13:53 -0700)]
Tweak diff colors

This patch does:

 - always reset the color _before_ printing out the newline.

   This is actually important. You (and Johannes) didn't see it, because
   it only matters if you set the background, but if you don't do this,
   you get some random and funky behaviour if you pick a color with a
   non-default background (which still potentially has problems with tabs
   etc, but less so).

 - allow people to have a different color for the "file headers"
   (DIFF_METAINFO) and for the "fragment header" (DIFF_FRAGINFO). Also,
   make a difference between "normal color" and "reset colors"

 - default to red/green for old/new lines. That's the norm, I'd think.

 - instead of that eye-popping (and eye-ball-with-a-fondue-fork-popping)
   purple color for metadata, use bold-face for file headers, and cyan for
   the frag headers. I actually prefer the "gray background" for that, but
   it only works well in xterms, so COLOR_CYAN it is..

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into next v1.4.1-rc1
Junio C Hamano [Thu, 22 Jun 2006 17:36:26 +0000 (10:36 -0700)]
Merge branch 'master' into next

* master:
  git-svn: fix commit --edit flag when using SVN:: libraries
  Makefile: do not force unneeded recompilation upon GIT_VERSION changes
  Check and document the options to prevent mistakes.
  Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.

18 years agoMerge branch 'js/lsfix'
Junio C Hamano [Thu, 22 Jun 2006 17:35:13 +0000 (10:35 -0700)]
Merge branch 'js/lsfix'

* js/lsfix:
  Initialize lock_file struct to all zero.
  Make git-update-ref a builtin
  Make git-update-index a builtin
  Make git-stripspace a builtin
  Make git-mailinfo a builtin
  Make git-mailsplit a builtin
  Make git-write-tree a builtin

18 years agoMerge branch 'ew/rebase'
Junio C Hamano [Thu, 22 Jun 2006 17:34:02 +0000 (10:34 -0700)]
Merge branch 'ew/rebase'

* ew/rebase:
  rebase --merge: fix for rebasing more than 7 commits.
  rebase: error out for NO_PYTHON if they use recursive merge
  Add renaming-rebase test.
  rebase: Allow merge strategies to be used when rebasing

18 years agoMerge branch 'jn/web'
Junio C Hamano [Thu, 22 Jun 2006 17:33:34 +0000 (10:33 -0700)]
Merge branch 'jn/web'

* jn/web:
  gitweb: whitespace cleanup around '='
  gitweb: Use $hash_base as $search_hash if possible
  gitweb: Make use of $PATH_INFO for project parameter
  Move $gitbin earlier in gitweb.cgi
  Add git version to gitweb output
  gitweb: whitespace cleanup
  gitweb: style done with stylesheet
  gitweb: A couple of page title tweaking
  Fix: Support for the standard mime.types map in gitweb
  gitweb: add type="text/css" to stylesheet link
  Make CSS file gitweb/gitweb.css more readable
  Fix gitweb stylesheet
  Support for the standard mime.types map in gitweb
  gitweb: text files for 'blob_plain' action without charset by default
  gitweb: safely output binary files for 'blob_plain' action
  Move gitweb style to gitweb.css

18 years agoMerge early parts of branch 'js/diff'
Junio C Hamano [Thu, 22 Jun 2006 17:32:58 +0000 (10:32 -0700)]
Merge early parts of branch 'js/diff'

18 years agoMerge branch 'jc/upload-corrupt'
Junio C Hamano [Thu, 22 Jun 2006 17:25:51 +0000 (10:25 -0700)]
Merge branch 'jc/upload-corrupt'

* jc/upload-corrupt:
  daemon: send stderr to /dev/null instead of closing.
  upload-pack/fetch-pack: support side-band communication
  Retire git-clone-pack
  upload-pack: prepare for sideband message support.
  upload-pack: avoid sending an incomplete pack upon failure

18 years agoMerge branch 'ew/rebase' into next
Junio C Hamano [Thu, 22 Jun 2006 09:29:58 +0000 (02:29 -0700)]
Merge branch 'ew/rebase' into next

* ew/rebase:
  rebase --merge: fix for rebasing more than 7 commits.

18 years agoMerge branch 'jn/web' into next
Junio C Hamano [Thu, 22 Jun 2006 09:29:50 +0000 (02:29 -0700)]
Merge branch 'jn/web' into next

* jn/web:
  gitweb: whitespace cleanup around '='
  gitweb: Use $hash_base as $search_hash if possible

18 years agogitweb: whitespace cleanup around '='
Jakub Narebski [Thu, 22 Jun 2006 06:52:57 +0000 (08:52 +0200)]
gitweb: whitespace cleanup around '='

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Use $hash_base as $search_hash if possible
Timo Hirvonen [Tue, 20 Jun 2006 13:41:05 +0000 (16:41 +0300)]
gitweb: Use $hash_base as $search_hash if possible

$hash (h parameter) does not always point to a commit. Use $hash_base as
$search_hash when it is defined.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/waitpid'
Junio C Hamano [Thu, 22 Jun 2006 09:19:08 +0000 (02:19 -0700)]
Merge branch 'jc/waitpid'

* jc/waitpid:
  Restore SIGCHLD to SIG_DFL where we care about waitpid().

18 years agoMerge branch 'ff/c99'
Junio C Hamano [Thu, 22 Jun 2006 09:18:51 +0000 (02:18 -0700)]
Merge branch 'ff/c99'

* ff/c99:
  Remove all void-pointer arithmetic.
  Change types used in bitfields to be `int's.
  Don't use empty structure initializers.
  Cast pointers to `void *' when used in a format.
  Don't instantiate structures with FAMs.
  Initialize FAMs using `FLEX_ARRAY'.
  Remove ranges from switch statements.

18 years agoMerge branch 'pb/config'
Junio C Hamano [Thu, 22 Jun 2006 09:15:45 +0000 (02:15 -0700)]
Merge branch 'pb/config'

* pb/config:
  git_config: access() returns 0 on success, not > 0
  repo-config: Fix late-night bug
  Read configuration also from $HOME/.gitconfig
  Fix setting config variables with an alternative GIT_CONFIG
  Support for extracting configuration from different files

18 years agoMerge branch 'lt/objlist'
Junio C Hamano [Thu, 22 Jun 2006 09:15:22 +0000 (02:15 -0700)]
Merge branch 'lt/objlist'

* lt/objlist:
  Add "named object array" concept

18 years agogit-svn: fix commit --edit flag when using SVN:: libraries
Eric Wong [Thu, 22 Jun 2006 08:22:46 +0000 (01:22 -0700)]
git-svn: fix commit --edit flag when using SVN:: libraries

Trying to open an interactive editor in the console while stdout is
being piped to the parent process doesn't work out very well.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMakefile: do not force unneeded recompilation upon GIT_VERSION changes
Junio C Hamano [Thu, 22 Jun 2006 09:04:27 +0000 (02:04 -0700)]
Makefile: do not force unneeded recompilation upon GIT_VERSION changes

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase --merge: fix for rebasing more than 7 commits.
Junio C Hamano [Thu, 22 Jun 2006 08:44:54 +0000 (01:44 -0700)]
rebase --merge: fix for rebasing more than 7 commits.

Instead of using 4-digit numbers to name commits being rebased,
just use "cmt.$msgnum" string, with $msgnum as a decimal number
without leading zero padding.  This makes it possible to rebase
more than 9999 commits, but of more practical importance is that
the earlier code used "printf" to format already formatted
$msgnum and barfed when it counted up to 0008.  In other words,
the old code was incapable of rebasing more than 7 commits, and
this fixes that problem.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCheck and document the options to prevent mistakes.
Eric W. Biederman [Wed, 21 Jun 2006 13:17:31 +0000 (07:17 -0600)]
Check and document the options to prevent mistakes.

When multiple recipients are given to git-send-email on the same
--cc line the code does not properly handle it.

Full and proper parsing of the email addresses so I can detect
which commas mean a new email address is more than I care to implement.

In particular this email address: "bibo,mao" <bibo.mao@intel.com>
must not be treated as two email addresses.

So this patch simply treats all commas in recipient lists as
an error and fails if one is given.

At the same time it documents that git-send-email wants multiple
instances of --cc specified on the command line if you want to
cc multiple recipients.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoPass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
Yakov Lerner [Thu, 22 Jun 2006 01:47:00 +0000 (04:47 +0300)]
Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.

Before this patch, -DDEFAULT_GIT_TEMPLATE_DIR was passed on compilation
command line to all and every .c file compiled. In fact the macro
is used by only one .c file, and unused by all other .c files.
Remove -DDEFAULT_GIT_TEMPLATE_DIR where unused. Follow the example of
exec_cmd.o. Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into next
Junio C Hamano [Thu, 22 Jun 2006 01:37:31 +0000 (18:37 -0700)]
Merge branch 'master' into next

* master:
  Fix grow_refs_hash()

18 years agoMerge branch 'jc/upload-corrupt' into next
Junio C Hamano [Wed, 21 Jun 2006 23:38:11 +0000 (16:38 -0700)]
Merge branch 'jc/upload-corrupt' into next

* jc/upload-corrupt:
  daemon: send stderr to /dev/null instead of closing.

18 years agoMerge branch 'jn/web' into next
Junio C Hamano [Wed, 21 Jun 2006 23:38:05 +0000 (16:38 -0700)]
Merge branch 'jn/web' into next

* jn/web:
  gitweb: Make use of $PATH_INFO for project parameter

18 years agodaemon: send stderr to /dev/null instead of closing.
Junio C Hamano [Wed, 21 Jun 2006 23:37:48 +0000 (16:37 -0700)]
daemon: send stderr to /dev/null instead of closing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Make use of $PATH_INFO for project parameter
Jakub Narebski [Wed, 21 Jun 2006 15:06:39 +0000 (17:06 +0200)]
gitweb: Make use of $PATH_INFO for project parameter

Allow to have project name in the path part of URL, just after the name of
script. For example instead of gitweb.cgi?p=git.git you can write
gitweb.cgi/git.git or gitweb.cgi/git.git/

Not used in URLs inside gitweb; it means that the above alternate syntax
must be generated by hand, at least for now.

Side effect: project name parameter is now stripped of leading and
trailing slash before validation.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix grow_refs_hash()
Linus Torvalds [Wed, 21 Jun 2006 18:01:12 +0000 (11:01 -0700)]
Fix grow_refs_hash()

Earlier commit 3e4339e6f96e8c4f38a9c6607b98d3e96a2ed783 had a
thinko that did not check for collisions while repopulating the
objects in the new hash table.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'ew/rebase' into next
Junio C Hamano [Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700)]
Merge branch 'ew/rebase' into next

* ew/rebase:
  rebase: error out for NO_PYTHON if they use recursive merge
  Add renaming-rebase test.
  rebase: Allow merge strategies to be used when rebasing
  object-refs: avoid division by zero

18 years agorebase: error out for NO_PYTHON if they use recursive merge
Eric Wong [Wed, 21 Jun 2006 10:04:42 +0000 (03:04 -0700)]
rebase: error out for NO_PYTHON if they use recursive merge

recursive merge relies on Python, and we can't perform
rename-aware merges without the recursive merge.  So bail out
before trying it.

The test won't work w/o recursive merge, either, so skip that,
too.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd renaming-rebase test.
Junio C Hamano [Sun, 18 Jun 2006 10:33:12 +0000 (03:33 -0700)]
Add renaming-rebase test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agorebase: Allow merge strategies to be used when rebasing
Eric Wong [Wed, 21 Jun 2006 10:04:41 +0000 (03:04 -0700)]
rebase: Allow merge strategies to be used when rebasing

This solves the problem of rebasing local commits against an
upstream that has renamed files.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoobject-refs: avoid division by zero
Andre Noll [Wed, 21 Jun 2006 02:46:05 +0000 (04:46 +0200)]
object-refs: avoid division by zero

Currently, we don't check refs_hash_size size and happily call
lookup_object_refs() even if refs_hash_size is zero which leads to
a division by zero in hash_obj().

Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'ff/c99' into next
Junio C Hamano [Wed, 21 Jun 2006 10:51:59 +0000 (03:51 -0700)]
Merge branch 'ff/c99' into next

* ff/c99:
  Remove all void-pointer arithmetic.

18 years agoMerge branch 'jc/upload-corrupt' into next
Junio C Hamano [Wed, 21 Jun 2006 09:50:59 +0000 (02:50 -0700)]
Merge branch 'jc/upload-corrupt' into next

* jc/upload-corrupt:
  upload-pack/fetch-pack: support side-band communication
  Retire git-clone-pack
  upload-pack: prepare for sideband message support.
  upload-pack: avoid sending an incomplete pack upon failure
  Fix possible out-of-bounds array access

18 years agoupload-pack/fetch-pack: support side-band communication
Junio C Hamano [Wed, 21 Jun 2006 07:30:21 +0000 (00:30 -0700)]
upload-pack/fetch-pack: support side-band communication

This implements a protocol extension between fetch-pack and
upload-pack to allow stderr stream from upload-pack (primarily
used for the progress bar display) to be passed back.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRetire git-clone-pack
Junio C Hamano [Wed, 21 Jun 2006 06:54:26 +0000 (23:54 -0700)]
Retire git-clone-pack

The program is not used by git-clone since git-fetch-pack was extended
to allow its caller do what git-clone-pack alone did, and git-clone was
updated to use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoupload-pack: prepare for sideband message support.
Junio C Hamano [Wed, 21 Jun 2006 05:48:23 +0000 (22:48 -0700)]
upload-pack: prepare for sideband message support.

This does not implement sideband for propagating the status to
the downloader yet, but add code to capture the standard error
output from the pack-objects process in preparation for sending
it off to the client when the protocol extension allows us to do
so.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoupload-pack: avoid sending an incomplete pack upon failure
Junio C Hamano [Wed, 21 Jun 2006 01:26:34 +0000 (18:26 -0700)]
upload-pack: avoid sending an incomplete pack upon failure

When the repository on the remote side is corrupted, rev-list
spawned from upload-pack would die with error, but pack-objects
that reads from the rev-list happily created a packfile that can
be unpacked by the downloader.  When this happens, the resulting
packfile is not corrupted and unpacks cleanly, but the list of
the objects contained in it is not what the protocol exchange
computed.

This update makes upload-pack to monitor its subprocesses, and
when either of them dies with error, sends an incomplete pack
data to the downloader to cause it to fail.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jn/web' into next
Junio C Hamano [Wed, 21 Jun 2006 09:33:43 +0000 (02:33 -0700)]
Merge branch 'jn/web' into next

* jn/web:
  Move $gitbin earlier in gitweb.cgi
  Add git version to gitweb output
  gitweb: whitespace cleanup

18 years agoFix possible out-of-bounds array access
Uwe Zeisberger [Wed, 21 Jun 2006 09:04:12 +0000 (11:04 +0200)]
Fix possible out-of-bounds array access

If match is "", match[-1] is accessed.  Let pathspec_matches return 1 in that
case indicating that "" matches everything.

Incidently this fixes git-grep'ing in ".".

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMove $gitbin earlier in gitweb.cgi
Jakub Narebski [Wed, 21 Jun 2006 07:48:04 +0000 (09:48 +0200)]
Move $gitbin earlier in gitweb.cgi

(cherry picked from 9dca843086356b964f27d8fabe1e3c48074a9f02 commit)

Signed-off-by: Jakub Narebski <jnareb.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd git version to gitweb output
Jakub Narebski [Wed, 21 Jun 2006 07:48:03 +0000 (09:48 +0200)]
Add git version to gitweb output

Add git-core binaries used version as the comment at the beginning of HTML
output, just below the comment with version of git web interface version.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: whitespace cleanup
Jakub Narebski [Wed, 21 Jun 2006 07:48:02 +0000 (09:48 +0200)]
gitweb: whitespace cleanup

Do not use tabs to align variable initialization (actually use
tabs only at the beginning of line, for code indent).  Remove trailing
whitespace.  Make whitespace usage more consistent.

Signed-off-by: Jakub Narebski <jnareb.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into next
Junio C Hamano [Wed, 21 Jun 2006 08:24:45 +0000 (01:24 -0700)]
Merge branch 'master' into next

* master:
  checkout -f: do not leave untracked working tree files.
  Log peer address when git-daemon called from inetd

18 years agocheckout -f: do not leave untracked working tree files.
Junio C Hamano [Tue, 20 Jun 2006 09:47:14 +0000 (02:47 -0700)]
checkout -f: do not leave untracked working tree files.

Earlier we did not consider untracked working tree files
"precious", but we have always considered them fair game to
clobber.  These days, branch switching by read-tree is more
careful and tries to protect untracked working tree files.  This
caused the following workflow to stop working:

git checkout one-branch-with-file-F
git checkout -f another-without-file-F
git pull . one-branch-with-file-F

Because the second checkout leaves F from the previous state as
untracked file in the working tree, the merge would fail, trying
to protect F from being clobbered.

This changes "git checkout -f" to remove working tree files that
are known to git in the switched-from state but do not exist in
the switched-to state, borrowing the same logic from "reset --hard".

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLog peer address when git-daemon called from inetd
David Woodhouse [Tue, 20 Jun 2006 14:38:13 +0000 (15:38 +0100)]
Log peer address when git-daemon called from inetd

When we run git-daemon from inetd, even with the --verbose option, it
doesn't log the peer address. That logic was only in the standalone
daemon code -- move it to the execute() function instead. Tested with
both IPv6 and Legacy IP clients, in both inetd and daemon mode.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jn/web' into next
Junio C Hamano [Tue, 20 Jun 2006 21:06:32 +0000 (14:06 -0700)]
Merge branch 'jn/web' into next

* jn/web:
  gitweb: style done with stylesheet
  gitweb: A couple of page title tweaking

18 years agogitweb: style done with stylesheet
Jakub Narebski [Tue, 20 Jun 2006 14:58:12 +0000 (14:58 +0000)]
gitweb: style done with stylesheet

Replace (almost) all 'style' attributes with 'class' attribute
and adding rule to CSS file. Some tables use CSS for styling
instead of legacy styling attributes.

[jc: too many rejects -- hand fixed and reindented]