git.git
18 years agoMerge branch 'jc/web-blame'
Junio C Hamano [Wed, 25 Oct 2006 20:18:06 +0000 (13:18 -0700)]
Merge branch 'jc/web-blame'

* jc/web-blame:
  gitweb: spell "blame --porcelain" with -p
  blame: Document and add help text for -f, -n, and -p
  gitweb: blame porcelain: lineno and orig lineno swapped
  Remove git-annotate.perl and create a builtin-alias for git-blame
  gitweb: use blame --porcelain
  git-blame --porcelain
  blame.c: move code to output metainfo into a separate function.
  git-blame: --show-number (and -n)
  git-blame: --show-name (and -f)
  blame.c: whitespace and formatting clean-up.
  Gitweb - provide site headers and footers
  gitweb: blame: Mouse-over commit-8 shows author and date
  gitweb: blame: print commit-8 on the leading row of a commit-block
  Revert 954a6183756a073723a7c9fd8d2feb13132876b0
  gitweb: prepare for repositories with packed refs.
  gitweb: make leftmost column of blame less cluttered.

18 years agoMerge branch 'maint'
Junio C Hamano [Wed, 25 Oct 2006 19:57:48 +0000 (12:57 -0700)]
Merge branch 'maint'

* maint:
  xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
  Update cherry documentation.
  Refer to git-rev-parse:Specifying Revisions from git.txt
  git-fetch.sh printed protocol fix
  RPM package re-classification.
  Documentation: note about contrib/.
  git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
  Set $HOME for selftests

18 years agoxdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
Petr Baudis [Wed, 25 Oct 2006 00:28:55 +0000 (02:28 +0200)]
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines

This removes the '#' and '(' tests and adds a '$' test instead although I have
no idea what it is actually good for - but hey, if that's what GNU diff does...

Pasky only went and did as Junio sayeth.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUpdate cherry documentation.
Junio C Hamano [Wed, 25 Oct 2006 06:14:30 +0000 (23:14 -0700)]
Update cherry documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRefer to git-rev-parse:Specifying Revisions from git.txt
Junio C Hamano [Wed, 25 Oct 2006 18:33:08 +0000 (11:33 -0700)]
Refer to git-rev-parse:Specifying Revisions from git.txt

The brief list given in "Symbolic Identifiers" section of the
main documentation is good enough for overview, but help the
reader to find a more comrehensive list as needed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-fetch.sh printed protocol fix
Tuncer Ayaz [Wed, 25 Oct 2006 10:03:06 +0000 (12:03 +0200)]
git-fetch.sh printed protocol fix

We have supported https:// protocol for some time and in 1.4.3
added ftp:// protocol.  The transfer were still reported to be
over http.

[jc: Tuncer used substring parameter substitution ${remote%%:*}
 but I am deferring it to a later day.  We should replace
 colon-expr with substring substitution after everybody's shell
 can grok it someday, but we are not in a hurry. ]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRPM package re-classification.
Junio C Hamano [Wed, 25 Oct 2006 06:55:46 +0000 (23:55 -0700)]
RPM package re-classification.

Grabbing anything that had *arch* in its name into git-arch
package was a wrong idea and we lost git-archive from git-core
by mistake.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation: note about contrib/.
Junio C Hamano [Tue, 24 Oct 2006 08:29:27 +0000 (01:29 -0700)]
Documentation: note about contrib/.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix symlink-to-file changes when using command-line svn 1.4.0
Eric Wong [Tue, 24 Oct 2006 09:50:37 +0000 (02:50 -0700)]
git-svn: fix symlink-to-file changes when using command-line svn 1.4.0

I incorrectly thought this was hopelessly broken in svn 1.4.0,
but now it's just broken in that the old method didn't work.  It
looks like svn propdel and svn propset must be used now and the
(imho) more obvious svn rm --force && svn add no longer works.

"make -C t full-svn-test" should now work.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSet $HOME for selftests
Gerrit Pape [Tue, 24 Oct 2006 20:00:37 +0000 (20:00 +0000)]
Set $HOME for selftests

Set HOME environment variable to test trash directory and export for
selftests.  This fixes the git-svn selftests with nonexistent or not
readable home, as found in at least one automated build system:

 http://buildd.debian.org/fetch.cgi?&pkg=git-core&ver=1%3A1.4.2.3-2&arch=alpha&stamp=1161537466&file=log

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Tue, 24 Oct 2006 02:29:05 +0000 (19:29 -0700)]
Merge branch 'maint'

* maint:
  gitweb: Fix setting $/ in parse_commit()
  daemon: do not die on older clients.
  xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
  git-clone: honor --quiet
  Documentation for the [remote] config
  prune-packed: Fix uninitialized variable.

18 years agogitweb: Fix setting $/ in parse_commit() v1.4.3.2
Petr Baudis [Tue, 24 Oct 2006 00:39:14 +0000 (02:39 +0200)]
gitweb: Fix setting $/ in parse_commit()

If the commit couldn't have been read, $/ wasn't restored to \n properly,
causing random havoc like git_get_ref_list() returning the ref names with
trailing \n.

Aside of potential confusion in the body of git_search(), no other $/
surprises are hopefully hidden in the code.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodaemon: do not die on older clients.
Junio C Hamano [Tue, 24 Oct 2006 01:26:05 +0000 (18:26 -0700)]
daemon: do not die on older clients.

In the older times, the clients did not say which host they were trying
to connect, and the code we recently added did not quite handle the
older clients correctly.

Noticed by Simon Arlott.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoxdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
Jim Meyering [Mon, 23 Oct 2006 20:22:25 +0000 (22:22 +0200)]
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.

This removes trailing blanks from git-generated diff headers
the same way a similar patch did that for GNU diff:

  http://article.gmane.org/gmane.comp.gnu.utils.bugs/13839

That is, it removes trailing blanks on the hunk header line that
shows the function name.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-clone: honor --quiet
Jim Meyering [Mon, 23 Oct 2006 13:59:48 +0000 (15:59 +0200)]
git-clone: honor --quiet

I noticed that a cron-launched "git-clone --quiet" was generating
progress output to standard error -- and thus always spamming me.
The offending output was due to git-clone invoking git-read-tree with
its undocumented -v option.
This change turns off "-v" for --quiet.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation for the [remote] config
Santi Béjar [Mon, 23 Oct 2006 16:42:14 +0000 (18:42 +0200)]
Documentation for the [remote] config

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoprune-packed: Fix uninitialized variable.
Alexandre Julliard [Mon, 23 Oct 2006 16:26:39 +0000 (18:26 +0200)]
prune-packed: Fix uninitialized variable.

The dryrun variable was made local instead of static by the previous
commit, and local variables aren't initialized to zero.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoignore-errors requires cl
Karl Hasselström [Mon, 23 Oct 2006 00:02:42 +0000 (17:02 -0700)]
ignore-errors requires cl

vc-git complains that it can't find the definition of ignore-errors
unless I (require 'cl). So I guess the correct place to do that is in
the file itself.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-send-email: do not pass custom Date: header
Eric Wong [Mon, 23 Oct 2006 07:46:37 +0000 (00:46 -0700)]
git-send-email: do not pass custom Date: header

We already generate a Date: header based on when the patch was
emailed.  git-format-patch includes the Date: header of the
patch.  Having two Date: headers is just confusing, so we
just use the current Date:

Often the mailed patches in a patch series are created over a
series of several hours or days, so the Date: header from the
original commit is incorrect for email, and often far off enough
for spam filters to complain.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoUse column indexes in git-cvsserver where necessary.
Shawn Pearce [Mon, 23 Oct 2006 05:09:35 +0000 (01:09 -0400)]
Use column indexes in git-cvsserver where necessary.

Tonight I found a git-cvsserver instance spending a lot of time in
disk IO while trying to process operations against a Git repository
with >30,000 objects contained in it.

Blowing away my SQLLite database and rebuilding all tables with
indexes on the attributes that git-cvsserver frequently runs queries
against seems to have resolved the issue quite nicely.

Since the indexes shouldn't hurt performance on small repositories
and always helps on larger repositories we should just always create
them when creating the revision storage tables.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add '..' (up directory) to tree view if applicable
Jakub Narebski [Sat, 21 Oct 2006 15:54:44 +0000 (17:54 +0200)]
gitweb: Add '..' (up directory) to tree view if applicable

Adds '..' (up directory) link at the top of "tree" view listing,
if both $hash_base and $file_name are provided, and $file_name
is not empty string.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Improve git_print_page_path
Jakub Narebski [Sat, 21 Oct 2006 15:53:55 +0000 (17:53 +0200)]
gitweb: Improve git_print_page_path

Add link to "tree root" (root directory) also for not defined name,
for example for "tree" action without defined "file_name" which means
"tree root".

Add " / " at the end of path when $type eq "tree".

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'np/pack'
Junio C Hamano [Mon, 23 Oct 2006 05:51:42 +0000 (22:51 -0700)]
Merge branch 'np/pack'

* np/pack:
  add the capability for index-pack to read from a stream
  index-pack: compare only the first 20-bytes of the key.
  git-repack: repo.usedeltabaseoffset
  pack-objects: document --delta-base-offset option
  allow delta data reuse even if base object is a preferred base
  zap a debug remnant
  let the GIT native protocol use offsets to delta base when possible
  make pack data reuse compatible with both delta types
  make git-pack-objects able to create deltas with offset to base
  teach git-index-pack about deltas with offset to base
  teach git-unpack-objects about deltas with offset to base
  introduce delta objects with offset to base

18 years agoMerge branch 'maint'
Junio C Hamano [Mon, 23 Oct 2006 05:40:30 +0000 (22:40 -0700)]
Merge branch 'maint'

* maint:
  pager: default to LESS=FRSX not LESS=FRS
  Make prune also run prune-packed
  git-vc: better installation instructions
  gitweb: Do not esc_html $basedir argument to git_print_tree_entry
  gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
  Fix usagestring for git-branch
  git-merge: show usage if run without arguments

18 years agopager: default to LESS=FRSX not LESS=FRS
Junio C Hamano [Mon, 23 Oct 2006 03:28:10 +0000 (20:28 -0700)]
pager: default to LESS=FRSX not LESS=FRS

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake prune also run prune-packed
J. Bruce Fields [Sun, 22 Oct 2006 23:01:23 +0000 (19:01 -0400)]
Make prune also run prune-packed

Both the git-prune manpage and everday.txt say that git-prune should also prune
unpacked objects that are also found in packs, by running git prune-packed.

Junio thought this was "a regression when prune was rewritten as a built-in."

So modify prune to call prune-packed again.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
18 years agogit-vc: better installation instructions
Karl Hasselström [Sun, 22 Oct 2006 18:46:36 +0000 (20:46 +0200)]
git-vc: better installation instructions

Provide some more detailed installation instructions, for the
elisp-challenged among us.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Do not esc_html $basedir argument to git_print_tree_entry
Jakub Narebski [Sat, 21 Oct 2006 15:53:09 +0000 (17:53 +0200)]
gitweb: Do not esc_html $basedir argument to git_print_tree_entry

In git_tree, rename $base variable (which is passed as $basedir
argument to git_print_tree_entry) to $basedir. Do not esc_html
$basedir, as it is part of file_name ('f') argument in link and not
printed. Add '/' at the end only if $basedir is not empty (it is empty
for top directory) and doesn't end in '/' already.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
Jakub Narebski [Sat, 21 Oct 2006 15:52:19 +0000 (17:52 +0200)]
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)

Code should be aligned the same way, regardless of tab size.
Use tabs for indent, but spaces for align.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix usagestring for git-branch
Lars Hjemli [Sun, 22 Oct 2006 11:30:24 +0000 (13:30 +0200)]
Fix usagestring for git-branch

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-merge: show usage if run without arguments
Rene Scharfe [Sat, 21 Oct 2006 18:51:04 +0000 (20:51 +0200)]
git-merge: show usage if run without arguments

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd the capability for index-pack to read from a stream
Nicolas Pitre [Fri, 20 Oct 2006 18:45:21 +0000 (14:45 -0400)]
add the capability for index-pack to read from a stream

This patch only adds the streaming capability to index-pack.  Although
the code is different it has the exact same functionality as before to
make sure nothing broke.

This is in preparation for receiving packs over the net, parse them on
the fly, fix them up if they are "thin" packs, and keep the resulting
pack instead of exploding it into loose objects.  But such functionality
should come separately.

One immediate advantage of this patch is that index-pack can now deal
with packs up to 4GB in size even on 32-bit architectures since the pack
is not entirely mmap()'d all at once anymore.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-clone: define die() and use it.
Dmitry V. Levin [Fri, 20 Oct 2006 19:38:31 +0000 (23:38 +0400)]
git-clone: define die() and use it.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Fri, 20 Oct 2006 23:51:05 +0000 (16:51 -0700)]
Merge branch 'maint'

* maint:
  Fix typo in show-index.c
  pager: default to LESS=FRS

18 years agoFix typo in show-index.c v1.4.3.1
Lars Hjemli [Fri, 20 Oct 2006 21:24:32 +0000 (23:24 +0200)]
Fix typo in show-index.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopager: default to LESS=FRS
Junio C Hamano [Fri, 20 Oct 2006 23:37:49 +0000 (16:37 -0700)]
pager: default to LESS=FRS

Recent change to paginate "git diff" by default is often irritating
when you do not have any change (or very small change) in your working
tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Fri, 20 Oct 2006 04:28:12 +0000 (21:28 -0700)]
Merge branch 'maint'

* maint:
  git-apply: prepare for upcoming GNU diff -u format change.

18 years agogit-apply: prepare for upcoming GNU diff -u format change.
Linus Torvalds [Fri, 20 Oct 2006 02:26:08 +0000 (19:26 -0700)]
git-apply: prepare for upcoming GNU diff -u format change.

The latest GNU diff from CVS emits an empty line to express
an empty context line, instead of more traditional "single
white space followed by a newline".  Do not get broken by it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDon't use $author_name undefined when $from contains no /\s</.
Jim Meyering [Thu, 19 Oct 2006 08:33:01 +0000 (10:33 +0200)]
Don't use $author_name undefined when $from contains no /\s</.

I noticed a case not handled in a recent patch.
Demonstrate it like this:

  $ touch new-file
  $ git-send-email --dry-run --from j --to k new-file 2>err
  new-file
  OK. Log says:
  Date: Thu, 19 Oct 2006 10:26:24 +0200
  Sendmail: /usr/sbin/sendmail
  From: j
  Subject:
  Cc:
  To: k

  Result: OK
  $ cat err
  Use of uninitialized value in pattern match (m//) at /p/bin/git-send-email line 416.
  Use of uninitialized value in concatenation (.) or string at /p/bin/git-send-email line 420.
  Use of uninitialized value in concatenation (.) or string at /p/bin/git-send-email line 468.

There's a patch for the $author_name part below.

The example above shows that $subject may also be used uninitialized.
That should be easy to fix, too.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'mw/pathinfo'
Junio C Hamano [Thu, 19 Oct 2006 05:09:11 +0000 (22:09 -0700)]
Merge branch 'mw/pathinfo'

* mw/pathinfo:
  gitweb: Fix search form when PATH_INFO is enabled
  gitweb: Document features better
  gitweb: warn if feature cannot be overridden.
  gitweb: start to generate PATH_INFO URLs.

Conflicts:

gitweb/README

18 years agoMerge branch 'js/diff'
Junio C Hamano [Thu, 19 Oct 2006 05:09:03 +0000 (22:09 -0700)]
Merge branch 'js/diff'

* js/diff:
  Turn on recursive with --summary

18 years agoMerge branch 'jc/send-email'
Junio C Hamano [Thu, 19 Oct 2006 05:09:00 +0000 (22:09 -0700)]
Merge branch 'jc/send-email'

* jc/send-email:
  Make git-send-email detect mbox-style patches more readily
  git-send-email: real name with period need to be dq-quoted on From: line
  git-send-email: do not drop custom headers the user prepared

18 years agoMerge branch 'jc/grep'
Junio C Hamano [Thu, 19 Oct 2006 05:08:58 +0000 (22:08 -0700)]
Merge branch 'jc/grep'

* jc/grep:
  teach revision walker about --all-match.
  grep --all-match

18 years agoMerge early part of branch 'jc/diff-apply-patch'
Junio C Hamano [Thu, 19 Oct 2006 05:08:46 +0000 (22:08 -0700)]
Merge early part of branch 'jc/diff-apply-patch'

18 years agoMerge branch 'jc/diff-numstat'
Junio C Hamano [Thu, 19 Oct 2006 05:08:42 +0000 (22:08 -0700)]
Merge branch 'jc/diff-numstat'

* jc/diff-numstat:
  diff --numstat

18 years agoMerge branch 'pb/bisect'
Junio C Hamano [Thu, 19 Oct 2006 05:08:39 +0000 (22:08 -0700)]
Merge branch 'pb/bisect'

* pb/bisect:
  bisect reset: Leave the tree in usable state if git-checkout failed

18 years agoMerge branch 'mw/send-email'
Junio C Hamano [Thu, 19 Oct 2006 05:08:37 +0000 (22:08 -0700)]
Merge branch 'mw/send-email'

* mw/send-email:
  Add --dry-run option to git-send-email

18 years agoMerge branch 'rs/rebase'
Junio C Hamano [Thu, 19 Oct 2006 05:08:31 +0000 (22:08 -0700)]
Merge branch 'rs/rebase'

* rs/rebase:
  git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
  git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.

18 years agoMerge branch 'sb/fetch'
Junio C Hamano [Thu, 19 Oct 2006 05:08:29 +0000 (22:08 -0700)]
Merge branch 'sb/fetch'

* sb/fetch:
  merge and resolve: Output short hashes and .. in "Updating ..."
  fetch: Misc output cleanup

18 years agoMerge branch 'sk/svn'
Junio C Hamano [Thu, 19 Oct 2006 05:08:26 +0000 (22:08 -0700)]
Merge branch 'sk/svn'

* sk/svn:
  git-svnimport.perl: copying directory from original SVN place

18 years agoMerge branch 'rs/zip'
Junio C Hamano [Thu, 19 Oct 2006 05:08:24 +0000 (22:08 -0700)]
Merge branch 'rs/zip'

* rs/zip:
  git-archive --format=zip: add symlink support
  git-archive --format=zip: use default version ID

18 years agoAdd revspec documentation for ':path', ':[0-3]:path' and git-describe
pclouds@gmail.com [Thu, 19 Oct 2006 03:04:55 +0000 (10:04 +0700)]
Add revspec documentation for ':path', ':[0-3]:path' and git-describe

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoReject hexstring longer than 40-bytes in get_short_sha1()
pclouds@gmail.com [Thu, 19 Oct 2006 01:34:41 +0000 (08:34 +0700)]
Reject hexstring longer than 40-bytes in get_short_sha1()

Such a string can never be a valid object name.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoreduce delta head inflated size
Nicolas Pitre [Wed, 18 Oct 2006 19:56:22 +0000 (15:56 -0400)]
reduce delta head inflated size

Supposing that both the base and result sizes were both full size 64-bit
values, their encoding would occupy only 9.2 bytes each.  Therefore
inflating 64 bytes is way overkill.  Limit it to 20 bytes instead which
should be plenty enough for a couple years to come.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoindex-pack: compare only the first 20-bytes of the key.
Nicolas Pitre [Tue, 17 Oct 2006 20:23:26 +0000 (16:23 -0400)]
index-pack: compare only the first 20-bytes of the key.

The "union delta_base" is a strange beast.  It is a 20-byte
binary blob key to search a binary searchable deltas[] array,
each element of which uses it to represent its base object with
either a full 20-byte SHA-1 or an offset in the pack.  Which
representation is used is determined by another field of the
deltas[] array element, obj->type, so there is no room for
confusion, as long as we make sure we compare the keys for the
same type only with appropriate length.  The code compared the
full union with memcmp().

When storing the in-pack offset, the union was first cleared
before storing an unsigned long, so comparison worked fine.

On 64-bit architectures, however, the union typically is 24-byte
long; the code did not clear the remaining 4-byte alignment
padding when storing a full 20-byte SHA-1 representation.  Using
memcmp() to compare the whole union was wrong.

This fixes the comparison to look at the first 20-bytes of the
union, regardless of the architecture.  As long as ulong is
smaller than 20-bytes this works fine.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-imap-send: Strip smtp From_ header from imap message. v1.4.3
Markus Amsler [Thu, 12 Oct 2006 22:19:35 +0000 (00:19 +0200)]
git-imap-send: Strip smtp From_ header from imap message.

Cyrus imap refuses messages with a 'From ' Header.

[jc: Mike McCormack says this is fine with Courier as well.]

Signed-off-by: Markus Amsler <markus.amsler@oribi.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd proper dependancies on the xdiff source
Andy Whitcroft [Tue, 17 Oct 2006 18:08:08 +0000 (19:08 +0100)]
add proper dependancies on the xdiff source

We are not rebuilding the xdiff library when its header files change.
Add dependancies for those to the main Makefile.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Acked-by: Ryan Anderson <ryan@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobisect reset: Leave the tree in usable state if git-checkout failed
Petr Baudis [Mon, 16 Oct 2006 00:59:25 +0000 (02:59 +0200)]
bisect reset: Leave the tree in usable state if git-checkout failed

I had local modifications in the tree and doing bisect reset required me to
manually edit .git/HEAD.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Tue, 17 Oct 2006 04:58:54 +0000 (21:58 -0700)]
Merge branch 'maint'

* maint:
  Fix hash function in xdiff library

18 years agoFix hash function in xdiff library v1.4.2.4
Linus Torvalds [Tue, 17 Oct 2006 02:58:54 +0000 (19:58 -0700)]
Fix hash function in xdiff library

Jim Mayering noticed that xdiff library took insanely long time
when comparing files with many identical lines.

This was because the hash function used in the library is broken
on 64-bit architectures and caused too many collisions.

http://thread.gmane.org/gmane.comp.version-control.git/28962/focus=28994

Acked-by: Davide Libenzi <davidel@xmaliserver.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agosvnimport: Fix broken tags being generated
Petr Baudis [Mon, 16 Oct 2006 01:00:37 +0000 (03:00 +0200)]
svnimport: Fix broken tags being generated

Currently git-svnimport generates broken tags missing the timespec in the
'tagger' line. This is a random stab at a minimal fix.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoReplace open-coded version of hash_sha1_file()
Rene Scharfe [Sun, 15 Oct 2006 12:02:18 +0000 (14:02 +0200)]
Replace open-coded version of hash_sha1_file()

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake write_sha1_file_prepare() void
Rene Scharfe [Sun, 15 Oct 2006 12:02:03 +0000 (14:02 +0200)]
Make write_sha1_file_prepare() void

Move file name generation from write_sha1_file_prepare() to the one
caller that cares and make it a void function.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRevert "move pack creation to version 3"
Junio C Hamano [Sun, 15 Oct 2006 06:37:41 +0000 (23:37 -0700)]
Revert "move pack creation to version 3"

This reverts commit 16854571aae6302f457c5fbee41ac64669b09595.
Git as recent as v1.1.6 do not understand version 3 delta.

v1.2.0 is Ok and I personally would say it is old enough, but
the improvement between version 2 and version 3 delta is not
bit enough to justify breaking older clients.

We should resurrect this later, but when we do so we shold
make it conditional.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/http' v1.4.3-rc3
Junio C Hamano [Sun, 15 Oct 2006 01:25:28 +0000 (18:25 -0700)]
Merge branch 'jc/http'

* jc/http:
  Add WEBDAV timeout to http-fetch.

18 years agoclone: the given repository dir should be relative to $PWD
Yasushi SHOJI [Sat, 14 Oct 2006 12:02:51 +0000 (21:02 +0900)]
clone: the given repository dir should be relative to $PWD

the repository argument for git-clone should be relative to $PWD
instead of the given target directory.  The old behavior gave us
surprising success and you need a few minute to know why it worked.

GIT_DIR is already exported so no need to cd into $D. And this makes
$PWD for git-fetch-pack, which is the actual command to take the given
repository dir, the same as git-clone.

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: fix "cvs diff" in a subdirectory
Johannes Schindelin [Tue, 10 Oct 2006 22:33:28 +0000 (00:33 +0200)]
cvsserver: fix "cvs diff" in a subdirectory

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsserver: Show correct letters for modified, removed and added files
Johannes Schindelin [Tue, 10 Oct 2006 22:20:43 +0000 (00:20 +0200)]
cvsserver: Show correct letters for modified, removed and added files

Earlier, cvsserver showed always an 'U', sometimes even without a space
between the 'U' and the name. Now, the correct letter is shown, with a
space.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: reduce memory usage for large commits
Eric Wong [Sat, 14 Oct 2006 22:48:35 +0000 (15:48 -0700)]
git-svn: reduce memory usage for large commits

apply_textdelta and send_stream can use a separate pool from the
rest of the editor interface, so we'll use a separate SVN::Pool
for them and clear the pool after each file is sent to SVN.

This drastically reduces memory usage per-changeset committed,
and makes large commits (and initial imports) of several
thousand files possible.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix tracing when GIT_TRACE is set to an empty string.
Christian Couder [Sat, 14 Oct 2006 14:05:25 +0000 (16:05 +0200)]
Fix tracing when GIT_TRACE is set to an empty string.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake write_sha1_file_prepare() static
Rene Scharfe [Sat, 14 Oct 2006 10:45:45 +0000 (12:45 +0200)]
Make write_sha1_file_prepare() static

There are no callers of write_sha1_file_prepare() left outside of
sha1_file.c, so make it static.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd hash_sha1_file()
Rene Scharfe [Sat, 14 Oct 2006 10:45:36 +0000 (12:45 +0200)]
Add hash_sha1_file()

Most callers of write_sha1_file_prepare() are only interested in the
resulting hash but don't care about the returned file name or the header.
This patch adds a simple wrapper named hash_sha1_file() which does just
that, and converts potential callers.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: fix commits over svn+ssh://
Eric Wong [Sat, 14 Oct 2006 09:02:37 +0000 (02:02 -0700)]
git-svn: fix commits over svn+ssh://

Once a get_commit_editor has been called from an SVN session, RA
layer operations are not allowed (well, unless you're using
file:// or http(s)://).  So we'll pass an alternate SVN::Ra
object to our editor object for running 'check-path'.

This should fix commits over svnserve (svn:// without ssh, too).

Closes Debian bug #392702, thanks to Pierre Habouzit for
reporting the bug.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff --numstat
Junio C Hamano [Thu, 12 Oct 2006 10:01:00 +0000 (03:01 -0700)]
diff --numstat

[jc: with documentation from Jakub]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-repack: repo.usedeltabaseoffset
Junio C Hamano [Sat, 14 Oct 2006 04:28:58 +0000 (21:28 -0700)]
git-repack: repo.usedeltabaseoffset

When configuration variable `repack.UseDeltaBaseOffset` is set
for the repository, the command passes `--delta-base-offset`
option to `git-pack-objects`; this typically results in slightly
smaller packs, but the generated packs are incompatible with
versions of git older than (and including) v1.4.3.

We will make it default to true sometime in the future, but not
for a while.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4015: work-around here document problem on Cygwin.
Junio C Hamano [Fri, 13 Oct 2006 21:20:27 +0000 (14:20 -0700)]
t4015: work-around here document problem on Cygwin.

Signed-off-by: Junio C Hamano <junio@twinsun.com>
18 years agoDocumentation: add missing second colons and remove a typo
Rene Scharfe [Thu, 12 Oct 2006 16:26:34 +0000 (18:26 +0200)]
Documentation: add missing second colons and remove a typo

It takes two colons to mark text as item label.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff: fix 2 whitespace issues
Johannes Schindelin [Thu, 12 Oct 2006 12:22:14 +0000 (14:22 +0200)]
diff: fix 2 whitespace issues

When whitespace or whitespace change was ignored, the function
xdl_recmatch() returned memcmp() style differences, which is wrong,
since it should return 0 on non-match.

Also, there were three horrible off-by-one bugs, even leading to wrong
hashes in the whitespace special handling.

The issue was noticed by Ray Lehtiniemi.

For good measure, this commit adds a test.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply --numstat -z: line termination fix.
Junio C Hamano [Thu, 12 Oct 2006 09:57:39 +0000 (02:57 -0700)]
apply --numstat -z: line termination fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: spell "blame --porcelain" with -p
Junio C Hamano [Thu, 12 Oct 2006 07:47:03 +0000 (00:47 -0700)]
gitweb: spell "blame --porcelain" with -p

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/blame' into jc/web-blame
Junio C Hamano [Thu, 12 Oct 2006 07:46:06 +0000 (00:46 -0700)]
Merge branch 'jc/blame' into jc/web-blame

* jc/blame:
  blame: Document and add help text for -f, -n, and -p
  Remove git-annotate.perl and create a builtin-alias for git-blame

18 years agoblame: Document and add help text for -f, -n, and -p
Junio C Hamano [Thu, 12 Oct 2006 07:44:27 +0000 (00:44 -0700)]
blame: Document and add help text for -f, -n, and -p

New options --show-name, --show-number and --porcelain were not
documented.  Also add -p as a short-hand for --porcelain for
consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: add a message encouraging use of SVN::* libraries
Eric Wong [Thu, 12 Oct 2006 01:19:55 +0000 (18:19 -0700)]
git-svn: add a message encouraging use of SVN::* libraries

I'm using svn 1.4.0-4 in Debian unstable and apparently there's
a regression on the SVN side that prevents a symlink from
becoming a regular file (which git supports, of course).

It's not a noticeable regression for most people, but this broke
the full-svn-tests target in t/Makefile for me.

The SVN::* Perl libraries seem to have matured and improved over
the past year, and git-svn has supported them for several months
now, so with that I encourage all users to start using the
SVN::* Perl libraries with git-svn.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocommit: fix a segfault when displaying a commit with unreachable parents
Eric Wong [Wed, 11 Oct 2006 23:16:02 +0000 (16:16 -0700)]
commit: fix a segfault when displaying a commit with unreachable parents

I was running git show on various commits found by fsck-objects
when I found this bug.  Since find_unique_abbrev() cannot find
an abbreviation for an object not in the database, it will
return NULL, which is bad to run strlen() on.  So instead, we'll
just display the unabbreviated sha1 that we referenced in the
commit.

I'm not sure that this is the best 'fix' for it because the
commit I was trying to show was broken, but I don't think a
program should segfault even if the user tries to do something
stupid.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: -h(elp) message formatting fixes
Eric Wong [Wed, 11 Oct 2006 21:53:36 +0000 (14:53 -0700)]
git-svn: -h(elp) message formatting fixes

'graft-branches' is slightly longer than the rest of the
commands, so the text was squished together in the formatted
output.  This patch just adds some more whitespace to make
the text look more pleasant.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/git-svn: document some of the newer features
Eric Wong [Wed, 11 Oct 2006 21:53:35 +0000 (14:53 -0700)]
Documentation/git-svn: document some of the newer features

I've forgotten to document many of the features added along the
way in the manpages.  This fills in some holes in the
documentation and adds updates some outdated information.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Fix search form when PATH_INFO is enabled
Petr Baudis [Wed, 11 Oct 2006 20:31:15 +0000 (22:31 +0200)]
gitweb: Fix search form when PATH_INFO is enabled

Currently that was broken. Ideal fix would make the search form use
PATH_INFO too, but it's just one insignificant place so it's no big deal if
we don't for now... This at least makes it work.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: log command fixes
Eric Wong [Wed, 11 Oct 2006 18:53:22 +0000 (11:53 -0700)]
git-svn: log command fixes

Change the --verbose flag to more closely match svn.  I was
somehow under the impression that --summary included --raw diff
output, but I was wrong.  We now pass -r --raw --name-status as
arguments if passed -v/--verbose.

-r (recursive) is passed by default, since users usually want
it, and accepting it causes difficulty with the -r<revision>
option used by svn users.  A --non-recursive switch has been
added to disable this.

Of course, --summary, --raw, -p and any other git-log options
can still be passed directly (without --name-status).

Also, several warnings about referencing undefined variables
have been fixed.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: multi-init saves and reuses --tags and --branches arguments
Eric Wong [Wed, 11 Oct 2006 18:53:21 +0000 (11:53 -0700)]
git-svn: multi-init saves and reuses --tags and --branches arguments

This should make it much easier to track newly added tags and
branches.  Re-running multi-init without command-line arguments
should now detect new-tags and branches.

--trunk shouldn't change often, but running multi-init on it
is now idempotent.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoatomic write for sideband remote messages
Nicolas Pitre [Wed, 11 Oct 2006 15:49:15 +0000 (11:49 -0400)]
atomic write for sideband remote messages

It has been a few times that I ended up with such a confusing display:

|remote: Generating pack...
|remote: Done counting 17 objects.
|remote: Result has 9 objects.
|remote: Deltifying 9 objects.
|remote:  100% (9/9) done
|remote: Unpacking 9 objects
|Total 9, written 9 (delta 8), reused 0 (delta 0)
| 100% (9/9) done

The confusion can be avoided in most cases by writing the remote message
in one go to prevent interleacing with local messages.  The buffer
declaration has been moved inside recv_sideband() to avoid extra string
copies.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd --dry-run option to git-send-email
Matthew Wilcox [Tue, 10 Oct 2006 14:58:23 +0000 (08:58 -0600)]
Add --dry-run option to git-send-email

Add a --dry-run option to git-send-email due to having made too many
mistakes with it in the past week.  I like having a safety catch on my
machine gun.

Signed-off-by: Matthew @ilcox <matthew@wil.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: blame porcelain: lineno and orig lineno swapped
Luben Tuikov [Wed, 11 Oct 2006 07:30:05 +0000 (00:30 -0700)]
gitweb: blame porcelain: lineno and orig lineno swapped

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
Junio C Hamano [Wed, 11 Oct 2006 07:57:17 +0000 (07:57 +0000)]
git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch

Signed-off-by: Junio C Hamano <junio@hera.kernel.org>
18 years agogit-pull: we say commit X, not X commit.
Junio C Hamano [Wed, 11 Oct 2006 06:00:29 +0000 (23:00 -0700)]
git-pull: we say commit X, not X commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-fetch --update-head-ok typofix
Junio C Hamano [Wed, 11 Oct 2006 05:29:02 +0000 (22:29 -0700)]
git-fetch --update-head-ok typofix

Martin Waitz noticed that one of the case arms had an impossible
choice.  It turns out that what it was checking was redundant and
the typo did not have any effect.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agopaginate git-diff by default
Martin Waitz [Tue, 10 Oct 2006 19:16:25 +0000 (21:16 +0200)]
paginate git-diff by default

18 years agopack-objects: document --delta-base-offset option
Junio C Hamano [Tue, 10 Oct 2006 08:06:20 +0000 (01:06 -0700)]
pack-objects: document --delta-base-offset option

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove git-annotate.perl and create a builtin-alias for git-blame
Ryan Anderson [Mon, 9 Oct 2006 10:32:05 +0000 (03:32 -0700)]
Remove git-annotate.perl and create a builtin-alias for git-blame

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd commit count options to git-shortlog v1.4.3-rc2
Nicolas Pitre [Fri, 6 Oct 2006 19:39:09 +0000 (15:39 -0400)]
add commit count options to git-shortlog

This patch does 3 things:

1) Output the number of commits along with the name for each author
   (nice to know for long lists spending more than a screen worth of
   commit lines).

2) Provide a switch (-n) to sort authors according to their number of
   commits instead of author alphabetic order.

3) Provide a switch (-s) to supress commit lines and only keep a
   summary of authors and the number of commits for each of them.

And for good measure a short usage is displayed with -h.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix git-revert
Junio C Hamano [Tue, 10 Oct 2006 02:19:45 +0000 (19:19 -0700)]
Fix git-revert

Defaulting to $replay for the sake of fixing cherry-pick was not
done conditionally, which broke git-revert.

Noticed by Luben.

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