git/git.git
14 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Fri, 1 Sep 2006 07:54:01 +0000 (00:54 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix some bugs in the new cherry-picking code
  gitk: Improve responsiveness while reading and layout out the graph
  gitk: Update preceding/following tag info when creating a tag
  gitk: Add a menu item for cherry-picking commits
  gitk: Fix a couple of buglets in the branch head menu items
  gitk: Add a context menu for heads
  gitk: Add a row context-menu item for creating a new branch
  gitk: Recompute ancestor/descendent heads/tags when rereading refs
  gitk: Minor cleanups

14 years agoConstness tightening for move/link_temp_to_file()
Junio C Hamano [Fri, 1 Sep 2006 07:17:47 +0000 (00:17 -0700)]
Constness tightening for move/link_temp_to_file()

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix git_blame
Aneesh Kumar K.V [Fri, 1 Sep 2006 03:43:32 +0000 (09:13 +0530)]
gitweb: Fix git_blame

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoInclude config.mak.autogen in the doc Makefile
Jonas Fonseca [Thu, 31 Aug 2006 22:31:08 +0000 (00:31 +0200)]
Include config.mak.autogen in the doc Makefile

... to install documentation relative to the path set with configure's
--prefix option.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse xmalloc instead of malloc
Jonas Fonseca [Thu, 31 Aug 2006 22:32:39 +0000 (00:32 +0200)]
Use xmalloc instead of malloc

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit(7): move gitk(1) to the list of porcelain commands
Jonas Fonseca [Thu, 31 Aug 2006 23:15:38 +0000 (01:15 +0200)]
git(7): move gitk(1) to the list of porcelain commands

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agot5710: fix two thinkos.
Junio C Hamano [Thu, 31 Aug 2006 21:14:20 +0000 (14:14 -0700)]
t5710: fix two thinkos.

The intention of the test seems to be to build a long chain of
clones that locally borrow objects from their parents and see the
system give up dereferencing long chains.  There were two problems:

 (1) it did not test the right repository;
 (2) it did not build a chain long enough to trigger the limitation.

I do not think it is a good test to make sure the limitation the
current implementation happens to have still exists, but that is
a topic at a totally different level.

At least this fixes the broken test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge early part of branch 'jc/daemon'
Junio C Hamano [Thu, 31 Aug 2006 20:00:39 +0000 (13:00 -0700)]
Merge early part of branch 'jc/daemon'

14 years agogitweb: Extend parse_difftree_raw_line to save commit info
Jakub Narebski [Wed, 30 Aug 2006 22:36:04 +0000 (00:36 +0200)]
gitweb: Extend parse_difftree_raw_line to save commit info

Extend parse_difftree_raw_line to save commit info from when
git-diff-tree is given only one <tree-ish>, for example when fed
from git-rev-list using --stdin option.

git-diff-tree outputs a line with the commit ID when applicable.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Separate printing of git_tree row into git_print_tree_entry
Jakub Narebski [Wed, 30 Aug 2006 22:35:07 +0000 (00:35 +0200)]
gitweb: Separate printing of git_tree row into git_print_tree_entry

This is preparation for "tree blame" (similar to what ViewVC shows)
output, i.e. for each entry give commit where it was changed.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Move git-ls-tree output parsing to parse_ls_tree_line
Jakub Narebski [Wed, 30 Aug 2006 22:32:15 +0000 (00:32 +0200)]
gitweb: Move git-ls-tree output parsing to parse_ls_tree_line

Add new subroutine parse_ls_tree_line and use it in git_tree.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agouse do() instead of require() to include configuration
Dennis Stosberg [Tue, 29 Aug 2006 07:19:02 +0000 (09:19 +0200)]
use do() instead of require() to include configuration

When run under mod_perl, require() will read and execute the configuration
file on the first invocation only.  On every subsequent invocation, all
configuration variables will be reset to their default values.  do() reads
and executes the configuration file unconditionally.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove forgotten call to git_to_hash
Dennis Stosberg [Thu, 31 Aug 2006 19:32:45 +0000 (21:32 +0200)]
gitweb: Remove forgotten call to git_to_hash

On Aug 27th, Jakub Narebski sent a patch which removed the git_to_hash()
function and this call to it. The patch did not apply cleanly and had to
be applied manually. Removing the last chunk has obviously been forgotten.

See: commit  0aea33762b1262d11fb43eda9f3fc152b5622cca and
     message <200608272345.26722.jnareb@gmail.com>

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agolog-tree.c: cleanup a bit append_signoff()
Franck Bui-Huu [Tue, 29 Aug 2006 11:37:06 +0000 (13:37 +0200)]
log-tree.c: cleanup a bit append_signoff()

This patch clean up append_signoff() by moving specific code that
looks up for "^[-A-Za-z]+: [^@]+@" pattern into a function.

It also stops the primary search when the cursor oversteps
'buf + at' limit.

This patch changes slightly append_signoff() behaviour too. If we
detect any Signed-off-by pattern during the primary search, we
needn't to do a pattern research after.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRemove uneeded #include
Johannes Schindelin [Tue, 29 Aug 2006 11:02:35 +0000 (13:02 +0200)]
Remove uneeded #include

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMakefile: fix typo
Johannes Schindelin [Tue, 29 Aug 2006 10:51:14 +0000 (12:51 +0200)]
Makefile: fix typo

We checked NO_SETENV instead of NO_UNSETENV to decide if unsetenv
is available.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agounpack-objects: remove unused variable "eof"
Johannes Schindelin [Tue, 29 Aug 2006 10:50:29 +0000 (12:50 +0200)]
unpack-objects: remove unused variable "eof"

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-fsck-objects: lacking default references should not be fatal
Linus Torvalds [Tue, 29 Aug 2006 18:47:30 +0000 (11:47 -0700)]
git-fsck-objects: lacking default references should not be fatal

The comment added says it all: if we have lost all references in a git
archive, git-fsck-objects should still work, so instead of dying it should
just notify the user about that condition.

This change was triggered by me just doing a "git-init-db" and then
populating that empty git archive with a pack/index file to look at it.
Having git-fsck-objects not work just because I didn't have any references
handy was rather irritating, since part of the reason for running
git-fsck-objects in the first place was to _find_ the missing references.

However, "--unreachable" really doesn't make sense in that situation, and
we want to turn it off to protect anybody who uses the old "git prune"
shell-script (rather than the modern built-in). The old pruning script
used to remove all objects that were reported as unreachable, and without
any refs, that obviously means everything - not worth it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCheck if pack directory exists prior to descending into it
Matthias Kestenholz [Tue, 29 Aug 2006 09:12:14 +0000 (11:12 +0200)]
Check if pack directory exists prior to descending into it

This fixes the following warning:

git-repack: line 42: cd: .git/objects/pack: No such file or directory

This happens only, when git-repack -a is run without any packs in the
repository.

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add local time and timezone to git_print_authorship
Jakub Narebski [Mon, 28 Aug 2006 21:17:31 +0000 (23:17 +0200)]
gitweb: Add local time and timezone to git_print_authorship

Add local time (hours and minutes) and local timezone to the output of
git_print_authorship command, used by git_commitdiff.  The code was
taken from git_commit subroutine.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add diff tree, with links to patches, to commitdiff view
Jakub Narebski [Mon, 28 Aug 2006 12:48:14 +0000 (14:48 +0200)]
gitweb: Add diff tree, with links to patches, to commitdiff view

Added/uncommented git_difftree_body invocation in git_commitdiff.
Added anchors (via 'id' attribute) to patches in patchset.
git_difftree_body is modified to link to patch anchor when called from
git_commitdiff, instead of link to blobdiff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: git_print_log: signoff line is non-empty line
Jakub Narebski [Mon, 28 Aug 2006 12:48:13 +0000 (14:48 +0200)]
gitweb: git_print_log: signoff line is non-empty line

This correct minor error in git_print_log that didn't add final empty
line when requested, if commit log ended with signoff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add author information to commitdiff view
Jakub Narebski [Mon, 28 Aug 2006 12:48:12 +0000 (14:48 +0200)]
gitweb: Add author information to commitdiff view

Add subroutine git_print_authorship to print author and date of
commit, div.author_date style to CSS, and use them in git_commitdiff.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Do not remove signoff lines in git_print_simplified_log
Jakub Narebski [Mon, 28 Aug 2006 12:48:11 +0000 (14:48 +0200)]
gitweb: Do not remove signoff lines in git_print_simplified_log

Remove '-remove_signoff => 1' option to git_print_log call in the
git_print_simplified_log subroutine.  This means that in "log" and
"commitdiff" views (git_log and git_commitdiff subroutines) signoff
lines will be shown.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Make git_print_log generic; git_print_simplified_log uses it
Jakub Narebski [Mon, 28 Aug 2006 12:48:10 +0000 (14:48 +0200)]
gitweb: Make git_print_log generic; git_print_simplified_log uses it

Collapse git_print_log and git_print_simplified_log into one
subroutine git_print_log.  git_print_simplified_log now simply calls
git_print_log with proper options.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
Dennis Stosberg [Mon, 28 Aug 2006 15:49:58 +0000 (17:49 +0200)]
gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}

This makes it possible to run gitweb under mod_perl's Apache::Registry.

It needs a fairly new git version, with --git-dir=<path>
parameter to git wrapper, i.e. post v1.4.2-rc2-g6acbcb9 version.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd --relative-date option to the revision interface
Jonas Fonseca [Mon, 28 Aug 2006 13:52:13 +0000 (15:52 +0200)]
Add --relative-date option to the revision interface

Exposes the infrastructure from 9a8e35e98793af086f05d1ca9643052df9b44a74.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'gl/web'
Junio C Hamano [Mon, 28 Aug 2006 23:20:28 +0000 (16:20 -0700)]
Merge branch 'gl/web'

* gl/web: (46 commits)
  gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
  gitweb: Remove git_to_hash function
  gitweb: Remove unused git_get_{preceding,following}_references
  gitweb: Fix typo in git_patchset_body
  gitweb: Fix typo in git_difftree_body
  gitweb: blobs defined by non-textual hash ids can be cached
  gitweb: Improve comments about gitweb features configuration
  gitweb: Remove workaround for git-diff bug fixed in f82cd3c
  gitweb: Remove creating directory for temporary files
  gitweb: Remove git_diff_print subroutine
  gitweb: git_blobdiff_plain is git_blobdiff('plain')
  gitweb: Use git-diff-tree or git-diff patch output for blobdiff
  gitweb: Change here-doc back for style consistency in git_blobdiff
  gitweb: Always display link to blobdiff_plain in git_blobdiff
  gitweb: Add invisible hyperlink to from-file/to-file diff header
  gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
  gitweb: Allow for pre-parsed difftree info in git_patchset_body
  gitweb: Add support for hash_parent_base parameter for blobdiffs
  gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
  gitweb: Add git_get_rev_name_tags function
  ...

14 years agogitk: Fix some bugs in the new cherry-picking code
Paul Mackerras [Mon, 28 Aug 2006 12:41:09 +0000 (22:41 +1000)]
gitk: Fix some bugs in the new cherry-picking code

When inserting the new commit row for the cherry-picked commit, we weren't
advancing the selected line (if there is one), and we weren't updating
commitlisted properly.

14 years agodaemon: prepare for multiple services.
Junio C Hamano [Mon, 21 Aug 2006 02:03:13 +0000 (19:03 -0700)]
daemon: prepare for multiple services.

This adds an infrastructure to selectively enable and disable
more than one services in git-daemon.  Currently upload-pack
service, which serves the git-fetch-pack and git-peek-remote
clients, is the only service that is defined.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd git-zip-tree to .gitignore
Rene Scharfe [Sun, 27 Aug 2006 11:19:49 +0000 (13:19 +0200)]
Add git-zip-tree to .gitignore

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofree(NULL) is perfectly valid.
Junio C Hamano [Mon, 28 Aug 2006 04:19:39 +0000 (21:19 -0700)]
free(NULL) is perfectly valid.

Jonas noticed some places say "if (X) free(X)" which is totally
unnecessary.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse xcalloc instead of calloc
Jonas Fonseca [Mon, 28 Aug 2006 00:26:07 +0000 (02:26 +0200)]
Use xcalloc instead of calloc

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse fstat instead of fseek
Jonas Fonseca [Sun, 27 Aug 2006 23:55:46 +0000 (01:55 +0200)]
Use fstat instead of fseek

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'gl/cleanup-next'
Junio C Hamano [Mon, 28 Aug 2006 03:34:09 +0000 (20:34 -0700)]
Merge branch 'gl/cleanup-next'

* gl/cleanup-next:
  hashcpy/hashcmp remaining bits.
  Convert memcpy(a,b,20) to hashcpy(a,b).

14 years agoMerge branch 'js/c-merge-recursive'
Junio C Hamano [Mon, 28 Aug 2006 03:18:58 +0000 (20:18 -0700)]
Merge branch 'js/c-merge-recursive'

* js/c-merge-recursive: (21 commits)
  discard_cache(): discard index, even if no file was mmap()ed
  merge-recur: do not die unnecessarily
  merge-recur: try to merge older merge bases first
  merge-recur: if there is no common ancestor, fake empty one
  merge-recur: do not setenv("GIT_INDEX_FILE")
  merge-recur: do not call git-write-tree
  merge-recursive: fix rename handling
  .gitignore: git-merge-recur is a built file.
  merge-recur: virtual commits shall never be parsed
  merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
  merge-recur: fix thinko in unique_path()
  Makefile: git-merge-recur depends on xdiff libraries.
  merge-recur: Explain why sha_eq() and struct stage_data cannot go
  merge-recur: Cleanup last mixedCase variables...
  merge-recur: Fix compiler warning with -pedantic
  merge-recur: Remove dead code
  merge-recur: Get rid of debug code
  merge-recur: Convert variable names to lower_case
  Cumulative update of merge-recursive in C
  recur vs recursive: help testing without touching too many stuff.
  ...

This is an evil merge that removes TEST script from the toplevel.

14 years agoMerge branch 'ts/daemon'
Junio C Hamano [Mon, 28 Aug 2006 00:51:42 +0000 (17:51 -0700)]
Merge branch 'ts/daemon'

* ts/daemon:
  Added support for dropping privileges to git-daemon.

14 years agoMerge branch 'jc/apply'
Junio C Hamano [Mon, 28 Aug 2006 00:51:05 +0000 (17:51 -0700)]
Merge branch 'jc/apply'

* jc/apply:
  git-apply --reject: finishing touches.
  apply --reject: count hunks starting from 1, not 0
  git-apply --verbose
  git-apply --reject: send rejects to .rej files.
  git-apply --reject
  apply --reverse: tie it all together.
  diff.c: make binary patch reversible.
  builtin-apply --reverse: two bugfixes.

14 years agogit-apply --reject: finishing touches.
Junio C Hamano [Sun, 27 Aug 2006 22:53:20 +0000 (15:53 -0700)]
git-apply --reject: finishing touches.

After a failed "git am" attempt:

git apply --reject --verbose .dotest/patch

applies hunks that are applicable and leaves *.rej files the
rejected hunks, and it reports what it is doing.  With --index,
files with a rejected hunk do not get their index entries
updated at all, so "git diff" will show the hunks that
successfully got applied.

Without --verbose to remind the user that the patch updated some
other paths cleanly, it is very easy to lose track of the status
of the working tree, so --reject implies --verbose.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
Jakub Narebski [Sun, 27 Aug 2006 21:49:36 +0000 (23:49 +0200)]
gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete

Added new global configuration variable @diff_opts, which holds
additional options (parameters) to git-diff and git-diff-tree, usually
dealing rename/copying detection.  Default value is '-M', taken from
git_commit subroutine.  Description of options and their approximate
cost by Junio C Hamano.

Changes:
* git_commitdiff, git_blobdiff and git_blobdiff_plain now use '-M'
  instead of '-M', '-C'
* git-diff now uses the same options as git-diff-tree
* git_comittdiff_plain now uses '-M' instead of '-B'
  and is now rename-aware
* git_rss uses now '-M' instead of ()

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-reset: remove unused variable
Rene Scharfe [Sun, 27 Aug 2006 11:19:58 +0000 (13:19 +0200)]
git-reset: remove unused variable

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-cherry: remove unused variable
Rene Scharfe [Sun, 27 Aug 2006 11:19:45 +0000 (13:19 +0200)]
git-cherry: remove unused variable

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove git_to_hash function
Jakub Narebski [Sun, 27 Aug 2006 21:45:26 +0000 (23:45 +0200)]
gitweb: Remove git_to_hash function

Remove git_to_hash function, which was to translate symbolic reference
to hash, and it's use in git_blobdiff.  We don't try so hard to guess
filename if it was not provided.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove unused git_get_{preceding,following}_references
Jakub Narebski [Sun, 27 Aug 2006 21:44:38 +0000 (23:44 +0200)]
gitweb: Remove unused git_get_{preceding,following}_references

Remove unused (and with errors in implementation)
git_get_{preceding,following}_references subroutines.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix typo in git_patchset_body
Jakub Narebski [Sat, 26 Aug 2006 17:14:23 +0000 (19:14 +0200)]
gitweb: Fix typo in git_patchset_body

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRelative timestamps in git log
Linus Torvalds [Sat, 26 Aug 2006 22:45:26 +0000 (15:45 -0700)]
Relative timestamps in git log

I noticed that I was looking at the kernel gitweb output at some point
rather than just do "git log", simply because I liked seeing the
simplified date-format, ie the "5 days ago" rather than a full date.

This adds infrastructure to do that for "git log" too. It does NOT add the
actual flag to enable it, though, so right now this patch is a no-op, but
it should now be easy to add a command line flag (and possibly a config
file option) to just turn on the "relative" date format.

The exact cut-off points when it switches from days to weeks etc are
totally arbitrary, but are picked somewhat to avoid the "1 weeks ago"
thing (by making it show "10 days ago" rather than "1 week", or "70
minutes ago" rather than "1 hour ago").

[jc: with minor fix and tweak around "month" and "week" area.]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd git-zip-tree
Rene Scharfe [Sat, 26 Aug 2006 21:19:21 +0000 (23:19 +0200)]
Add git-zip-tree

In the Windows world ZIP files are better supported than tar files.
Windows even includes built-in support for ZIP files nowadays.

git-zip-tree is similar to git-tar-tree; it creates ZIP files out of
git trees.  It stores the commit ID (if available) in a ZIP file comment
which can be extracted by unzip.

There's still quite some room for improvement: this initial version
supports no symlinks, calls write() way too often (three times per file)
and there is no unit test.

[jc: with a minor typefix to avoid void* arithmetic]

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Fix typo in git_difftree_body
Jakub Narebski [Sat, 26 Aug 2006 21:33:58 +0000 (23:33 +0200)]
gitweb: Fix typo in git_difftree_body

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: stop repeatedly reusing the first commit message with dcommit
Eric Wong [Sat, 26 Aug 2006 16:52:25 +0000 (09:52 -0700)]
git-svn: stop repeatedly reusing the first commit message with dcommit

Excessive use of global variables got me into trouble.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse xrealloc instead of realloc
Jonas Fonseca [Sat, 26 Aug 2006 14:16:18 +0000 (16:16 +0200)]
Use xrealloc instead of realloc

Change places that use realloc, without a proper error path, to instead use
xrealloc. Drop an erroneous error path in the daemon code that used errno
in the die message in favour of the simpler xrealloc.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse PATH_MAX instead of MAXPATHLEN
Jonas Fonseca [Sat, 26 Aug 2006 14:09:17 +0000 (16:09 +0200)]
Use PATH_MAX instead of MAXPATHLEN

According to sys/paramh.h it's a "BSD name" for values defined in
<limits.h>. Besides PATH_MAX seems to be more commonly used.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoConvert unpack_entry_gently and friends to use offsets.
Shawn Pearce [Sat, 26 Aug 2006 08:12:27 +0000 (04:12 -0400)]
Convert unpack_entry_gently and friends to use offsets.

Change unpack_entry_gently and its helper functions to use offsets
rather than addresses and left counts to supply pack position
information.  In most cases this makes the code easier to follow,
and it reduces the number of local variables in a few functions.
It also better prepares this code for mapping partial segments of
packs and altering what regions of a pack are mapped while unpacking
an entry.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCleanup unpack_object_header to use only offsets.
Shawn Pearce [Sat, 26 Aug 2006 08:12:04 +0000 (04:12 -0400)]
Cleanup unpack_object_header to use only offsets.

If we're always incrementing both the offset and the pointer we
aren't gaining anything by keeping both.  Instead just use the
offset since that's what we were given and what we are expected
to return.  Also using offset is likely to make it easier to remap
the pack in the future should partial mapping of very large packs
get implemented.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCleanup unpack_entry_gently and friends to use type_name array.
Shawn Pearce [Sat, 26 Aug 2006 08:11:36 +0000 (04:11 -0400)]
Cleanup unpack_entry_gently and friends to use type_name array.

[PATCH 3/5] Cleanup unpack_entry_gently and friends to use type_name array.

This change allows combining all of the non-delta entries into a
single case, as well as to remove an unnecessary local variable
in unpack_entry_gently.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoReuse compression code in unpack_compressed_entry.
Shawn Pearce [Sat, 26 Aug 2006 08:11:02 +0000 (04:11 -0400)]
Reuse compression code in unpack_compressed_entry.

[PATCH 2/5] Reuse compression code in unpack_compressed_entry.

This cleans up the code by reusing a perfectly good decompression
implementation at the expense of 1 extra byte of memory allocated in
temporary memory while the delta is being decompressed and applied
to the base.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoReorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
Shawn Pearce [Sat, 26 Aug 2006 08:10:43 +0000 (04:10 -0400)]
Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.

This function was moved above unpack_delta_entry so we can call it
from within unpack_delta_entry without a forward declaration.

This change looks worse than it is.  Its really just a relocation
of unpack_non_delta_entry to earlier in the file and renaming the
function to unpack_compressed_entry.  No other changes were made.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: blobs defined by non-textual hash ids can be cached
Jakub Narebski [Sat, 26 Aug 2006 17:14:25 +0000 (19:14 +0200)]
gitweb: blobs defined by non-textual hash ids can be cached

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Improve comments about gitweb features configuration
Jakub Narebski [Sat, 26 Aug 2006 17:14:22 +0000 (19:14 +0200)]
gitweb: Improve comments about gitweb features configuration

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove workaround for git-diff bug fixed in f82cd3c
Jakub Narebski [Sat, 26 Aug 2006 10:33:17 +0000 (12:33 +0200)]
gitweb: Remove workaround for git-diff bug fixed in f82cd3c

Remove workaround in git_blobdiff for error in git-diff (showing
reversed diff for diff of blobs), corrected in commit f82cd3c
Fix "git diff blob1 blob2" showing the diff in reverse.  which
is post 1.4.2-rc2 commit.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMerge branch 'master' into gl/web
Junio C Hamano [Sat, 26 Aug 2006 08:08:39 +0000 (01:08 -0700)]
Merge branch 'master' into gl/web

* master: (34 commits)
  gitweb: git_annotate didn't expect negative numeric timezone
  git-svn: add the 'dcommit' command
  git-svn: recommend rebase for syncing against an SVN repo
  git-svn: establish new connections on commit after fork
  describe: fix off-by-one error in --abbrev=40 handling
  git-svn(1): improve asciidoc markup
  gitview.txt: improve asciidoc markup
  git(7): put the synopsis in a verse style paragraph
  gitk(1): expand the manpage to look less like a template
  git-blame(1): mention options in the synopsis and advertise pickaxe
  git-ls-remote(1): document --upload-pack
  git-apply(1): document missing options and improve existing ones
  update-index -g
  n is in fact unused, and is later shadowed.
  use name[len] in switch directly, instead of creating a shadowed variable.
  builtin-grep.c: remove unused debugging piece.
  remove ugly shadowing of loop indexes in subloops.
  missing 'static' keywords
  git_dir holds pointers to local strings, hence MUST be const.
  avoid to use error that shadows the function name, use err instead.
  ...

14 years agoMerge branch 'gl/cleanup'
Junio C Hamano [Sat, 26 Aug 2006 08:06:22 +0000 (01:06 -0700)]
Merge branch 'gl/cleanup'

* gl/cleanup:
  Convert memset(hash,0,20) to hashclr(hash).
  Convert memcpy(a,b,20) to hashcpy(a,b).

14 years agogitweb: git_annotate didn't expect negative numeric timezone
Jakub Narebski [Sat, 26 Aug 2006 00:13:05 +0000 (02:13 +0200)]
gitweb: git_annotate didn't expect negative numeric timezone

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: add the 'dcommit' command
Eric Wong [Sat, 26 Aug 2006 07:01:23 +0000 (00:01 -0700)]
git-svn: add the 'dcommit' command

This is a high-level wrapper around the 'commit-diff' command
and used to produce cleaner history against the mirrored repository
through rebase/reset usage.

It's basically a more polished version of this:

for i in `git rev-list --no-merges remotes/git-svn..HEAD | tac`; do
git-svn commit-diff $i~1 $i
done
git reset --hard remotes/git-svn

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: recommend rebase for syncing against an SVN repo
Eric Wong [Fri, 25 Aug 2006 19:48:23 +0000 (12:48 -0700)]
git-svn: recommend rebase for syncing against an SVN repo

Does this make sense to other git-svn users out there?

pull can give funky history unless you understand how git-svn works
internally, which users should not be expected to do.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: establish new connections on commit after fork
Eric Wong [Fri, 25 Aug 2006 19:28:18 +0000 (12:28 -0700)]
git-svn: establish new connections on commit after fork

SVN seems to have a problem with https:// repositories from
time-to-time when doing multiple, sequential commits.  This
problem is not consistently reproducible without the patch,
but it should go away entirely with this patch...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodescribe: fix off-by-one error in --abbrev=40 handling
Jonas Fonseca [Fri, 25 Aug 2006 00:48:04 +0000 (02:48 +0200)]
describe: fix off-by-one error in --abbrev=40 handling

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove creating directory for temporary files
Jakub Narebski [Fri, 25 Aug 2006 19:35:27 +0000 (21:35 +0200)]
gitweb: Remove creating directory for temporary files

Remove $git_temp variable which held location for temporary files
needed by git_diff_print, and removed creating $git_temp directory.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove git_diff_print subroutine
Jakub Narebski [Fri, 25 Aug 2006 19:15:27 +0000 (21:15 +0200)]
gitweb: Remove git_diff_print subroutine

Remove git_diff_print subroutine, used to print diff in previous
versions of "diff" actions, namely git_commitdiff,
git_commitdiff_plain, git_blobdiff, git_blobdiff_plain.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: git_blobdiff_plain is git_blobdiff('plain')
Jakub Narebski [Fri, 25 Aug 2006 19:14:49 +0000 (21:14 +0200)]
gitweb: git_blobdiff_plain is git_blobdiff('plain')

git_blobdiff and git_blobdiff_plain are now collapsed into one
subroutine git_blobdiff, with format (currently 'html' which is
default format corresponding to git_blobdiff, and 'plain'
corresponding to git_blobdiff_plain) specified in argument.

blobdiff_plain format is now generated either by git-diff-tree
or by git-diff.  Added X-Git-Url: header.  From-file and to-file name
in header are corrected.

Note that for now commitdiff_plain does not detect renames
and copying, while blobdiff_plain does.

While at it, set expires to "+1d" for non-textual hash ids.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use git-diff-tree or git-diff patch output for blobdiff
Jakub Narebski [Fri, 25 Aug 2006 19:13:34 +0000 (21:13 +0200)]
gitweb: Use git-diff-tree or git-diff patch output for blobdiff

This is second part of removing gitweb dependency on external
diff (used in git_diff_print).

Get rid of git_diff_print invocation in git_blobdiff, and use either
git-diff-tree (when both hash_base and hash_parent_base are provided)
patch format or git-diff patch format (when only hash and hash_parent
are provided) for output.

Supported URI schemes, and output formats:
* New URI scheme: both hash_base and hash_parent_base (trees-ish
  containing blobs versions we want to compare) are provided.
  Also either filename is provided, or hash (of blob) is provided
  (we try to find filename then).

  For this scheme we have copying and renames detection, mode changes,
  file types etc., and information extended diff header is correct.

* Old URI scheme: hash_parent_base is not provided, we use hash and
  hash_parent to directly compare blobs using git-diff. If no filename
  is given, blobs hashes are used in place of filenames.

  This scheme has always "blob" as file type, it cannot detect mode
  changes, and we rely on CGI parameters to provide name of the file.

Added git_to_hash subroutine, which transforms symbolic name or list
of symbolic name to hash or list of hashes using git-rev-parse.

To have "blob" instead of "unknown" (or "file" regardless of the type)
in "gitweb diff header" for legacy scheme, file_type function now
returns its argument if it is not octal string.

Added support for fake "2" status code in git_patchset_body. Such code
is generated by git_blobdiff in legacy scheme case.

ATTENTION: The order of arguments (operands) to git-diff is reversed
(sic!) to have correct diff in the legacy (no hash_parent_base) case.
$hash_parent, $hash ordering is commented out, as it gives reversed
patch (at least for git version 1.4.1.1) as compared to output in new
scheme and output of older gitweb version.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Change here-doc back for style consistency in git_blobdiff
Jakub Narebski [Fri, 25 Aug 2006 19:06:49 +0000 (21:06 +0200)]
gitweb: Change here-doc back for style consistency in git_blobdiff

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Always display link to blobdiff_plain in git_blobdiff
Jakub Narebski [Fri, 25 Aug 2006 19:05:45 +0000 (21:05 +0200)]
gitweb: Always display link to blobdiff_plain in git_blobdiff

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add invisible hyperlink to from-file/to-file diff header
Jakub Narebski [Fri, 25 Aug 2006 19:05:07 +0000 (21:05 +0200)]
gitweb: Add invisible hyperlink to from-file/to-file diff header

Change replacing hashes as from-file/to-file with filenames from
difftree to adding invisible (except underlining on hover/mouseover)
hyperlink to from-file/to-file blob.  /dev/null as from-file or
to-file is not changed (is not hyperlinked).

This makes two-file from-file/to-file unified diff header parsing in
git_patchset_body more generic, and not only for legacy blobdiffs.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Parse two-line from-file/to-file diff header in git_patchset_body
Jakub Narebski [Fri, 25 Aug 2006 19:04:13 +0000 (21:04 +0200)]
gitweb: Parse two-line from-file/to-file diff header in git_patchset_body

Parse two-line from-file/to-file unified diff header in
git_patchset_body directly, instead of leaving pretty-printing to
format_diff_line function.  Hashes as from-file/to-file are replaced
by proper from-file and to-file names (from $diffinfo); in the future
we can put hyperlinks there.  This makes possible to do blobdiff with
only blobs hashes.

The lines in two-line unified diff header have now class "from_file"
and "to_file"; the style is chosen to match previous output (classes
"rem" and "add" because of '-' and '+' as first character of patch
line).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Allow for pre-parsed difftree info in git_patchset_body
Jakub Narebski [Fri, 25 Aug 2006 18:59:39 +0000 (20:59 +0200)]
gitweb: Allow for pre-parsed difftree info in git_patchset_body

Preparation for converting git_blobdiff and git_blobdiff_plain
to use git-diff-tree patch format to generate patches.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add support for hash_parent_base parameter for blobdiffs
Jakub Narebski [Thu, 24 Aug 2006 21:53:54 +0000 (23:53 +0200)]
gitweb: Add support for hash_parent_base parameter for blobdiffs

Add support for hash_parent_base in input validation part and in
href() function.  Add proper hash_parent_base to all calls to blobdiff
and blobdiff_plain action URLs. Use hash_parent_base as hash_base for
blobs of hash_parent.

To be used in future rewrite of git_blobdiff and git_blobdiff_plain.

While at it, move project before action in ordering CGI parameters in
href().

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
Jakub Narebski [Thu, 24 Aug 2006 17:45:30 +0000 (19:45 +0200)]
gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header

Use git_get_rev_name_tags function for X-Git-Tag: header in
git_commitdiff('plain'), i.e. for commitdiff_plain action.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add git_get_rev_name_tags function
Jakub Narebski [Thu, 24 Aug 2006 17:41:23 +0000 (19:41 +0200)]
gitweb: Add git_get_rev_name_tags function

Add git_get_rev_name_tags function, for later use in
git_commitdiff('plain') for X-Git-Tag: header.

This function, contrary to the call to
  git_get_following_references($hash, "tags");
_does_ strip "tags/" and returns bare tag name.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Faster return from git_get_preceding_references if possible
Jakub Narebski [Thu, 24 Aug 2006 17:39:32 +0000 (19:39 +0200)]
gitweb: Faster return from git_get_preceding_references if possible

Return on first ref found when git_get_preceding_references
is called in scalar context

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Add git_get_{following,preceding}_references functions
Jakub Narebski [Thu, 24 Aug 2006 17:37:04 +0000 (19:37 +0200)]
gitweb: Add git_get_{following,preceding}_references functions

Adds git_get_following_references function, based on code which was
used in git_commitdiff_plain to generate X-Git-Tag: header,
and companion git_get_preceding_references function.

Both functions return array of all references of given type (as
returned by git_get_references) following/preceding given commit in
array (list) context, and last following/first preceding ref in scalar
context.

Stripping ref (list of refs) of "$type/" (e.g. "tags/") is left to
caller.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Streamify patch output in git_commitdiff
Jakub Narebski [Thu, 24 Aug 2006 17:34:36 +0000 (19:34 +0200)]
gitweb: Streamify patch output in git_commitdiff

Change output of patch(set) in git_commitdiff from slurping whole diff
in @patchset array before processing, to passing file descriptor to
git_patchset_body.

Advantages: faster, incremental output, smaller memory footprint.
Disadvantages: cannot react when there is error during closing file
descriptor.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Remove invalid comment in format_diff_line
Jakub Narebski [Thu, 24 Aug 2006 17:32:13 +0000 (19:32 +0200)]
gitweb: Remove invalid comment in format_diff_line

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Show information about incomplete lines in commitdiff
Jakub Narebski [Wed, 23 Aug 2006 23:58:49 +0000 (01:58 +0200)]
gitweb: Show information about incomplete lines in commitdiff

In format_diff_line, instead of skipping errors/incomplete lines,
for example
  "\ No newline at end of file"
in HTML pretty-printing of diff, use "incomplete" class for div.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitweb: Use git-diff-tree patch output for commitdiff
Jakub Narebski [Wed, 23 Aug 2006 22:15:14 +0000 (00:15 +0200)]
gitweb: Use git-diff-tree patch output for commitdiff

Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.

git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.

Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.

Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.

While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.

CHANGES TO OUTPUT:
 * "commitdiff" now products patches with renaming and copying
   detection (git-diff-tree is invoked with -M and -C options).
   Empty patches (mode changes and pure renames and copying)
   are not written currently. Former version broke renaming and
   copying, and didn't notice mode changes, like this version.

 * "commitdiff" output is now divided into several div elements
   of class "log", "patchset" and "patch".

 * "commitdiff_plain" now only generates X-Git-Tag: line only if there
   is tag pointing to the current commit. Former version which wrote
   first tag following current commit was broken[*1*]; besides we are
   interested rather in tags _preceding_ the commit, and _heads_
   following the commit. X-Git-Url: now is current URL; former version
   tried[*2*] to output URL to HTML version of commitdiff.

 * "commitdiff_plain" is generated by git-diff-tree, and has therefore
   has git specific extensions to diff format: "git diff" header and
   optional extended header lines.

FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).

[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn(1): improve asciidoc markup
Jonas Fonseca [Fri, 25 Aug 2006 01:07:46 +0000 (03:07 +0200)]
git-svn(1): improve asciidoc markup

Use list continuation to have better wrapping. This accounts for most of
the changes because it reindents a lot of text without applying other
changes.

Use cross-referencing for interlinking and the gitlink macro for pointing
to other tools in the git suite.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitview.txt: improve asciidoc markup
Jonas Fonseca [Fri, 25 Aug 2006 01:06:50 +0000 (03:06 +0200)]
gitview.txt: improve asciidoc markup

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit(7): put the synopsis in a verse style paragraph
Jonas Fonseca [Fri, 25 Aug 2006 01:05:48 +0000 (03:05 +0200)]
git(7): put the synopsis in a verse style paragraph

... so it wraps properly in small terminals.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogitk(1): expand the manpage to look less like a template
Jonas Fonseca [Fri, 25 Aug 2006 01:04:58 +0000 (03:04 +0200)]
gitk(1): expand the manpage to look less like a template

Add a short description and document a few selected options additionally to
the different "entities" in the standard calling convention. Advertise
other git repository browsers. Lastly, climb Mount Ego.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-blame(1): mention options in the synopsis and advertise pickaxe
Jonas Fonseca [Fri, 25 Aug 2006 01:01:49 +0000 (03:01 +0200)]
git-blame(1): mention options in the synopsis and advertise pickaxe

Inspired by the cvs annotate documentation improve and expand the man page
to also mention the limitations of file annotations. Since people coming
from the SVN/CVS world might first look here, also briefly advertise how
the pickaxe interface makes it easy to go beyond these limitation.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-ls-remote(1): document --upload-pack
Jonas Fonseca [Fri, 25 Aug 2006 00:58:20 +0000 (02:58 +0200)]
git-ls-remote(1): document --upload-pack

... and mention that '.' will list the local repo references.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-apply(1): document missing options and improve existing ones
Jonas Fonseca [Fri, 25 Aug 2006 00:56:55 +0000 (02:56 +0200)]
git-apply(1): document missing options and improve existing ones

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoupdate-index -g
Junio C Hamano [Thu, 24 Aug 2006 04:24:47 +0000 (21:24 -0700)]
update-index -g

I often find myself typing this but the common abbreviation "g" for
"again" has not been supported so far for some unknown reason.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agon is in fact unused, and is later shadowed.
Pierre Habouzit [Wed, 23 Aug 2006 10:39:16 +0000 (12:39 +0200)]
n is in fact unused, and is later shadowed.

date.c::approxidate_alpha() counts the number of alphabets
while moving the pointer but does not use the count.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agouse name[len] in switch directly, instead of creating a shadowed variable.
Pierre Habouzit [Wed, 23 Aug 2006 10:39:15 +0000 (12:39 +0200)]
use name[len] in switch directly, instead of creating a shadowed variable.

builtin-apply.c defines a local variable 'c' which is used only
once and then later gets shadowed by another instance of 'c'.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agobuiltin-grep.c: remove unused debugging piece.
Junio C Hamano [Thu, 24 Aug 2006 01:39:49 +0000 (18:39 -0700)]
builtin-grep.c: remove unused debugging piece.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoremove ugly shadowing of loop indexes in subloops.
Pierre Habouzit [Wed, 23 Aug 2006 10:39:13 +0000 (12:39 +0200)]
remove ugly shadowing of loop indexes in subloops.

builtin-mv.c and git.c has a nested loop that is governed by a
variable 'i', but they shadow it with another instance of 'i'.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agomissing 'static' keywords
Pierre Habouzit [Wed, 23 Aug 2006 10:39:12 +0000 (12:39 +0200)]
missing 'static' keywords

builtin-tar-tree.c::git_tar_config() and http-push.c::add_one_object()
are not used outside their own files.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit_dir holds pointers to local strings, hence MUST be const.
Pierre Habouzit [Wed, 23 Aug 2006 10:39:11 +0000 (12:39 +0200)]
git_dir holds pointers to local strings, hence MUST be const.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoavoid to use error that shadows the function name, use err instead.
Pierre Habouzit [Wed, 23 Aug 2006 10:39:10 +0000 (12:39 +0200)]
avoid to use error that shadows the function name, use err instead.

builtin-apply.c and builtin-push.c uses a local variable called 'error'
which shadows the error() function.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agohashcpy/hashcmp remaining bits.
Junio C Hamano [Wed, 23 Aug 2006 21:31:20 +0000 (14:31 -0700)]
hashcpy/hashcmp remaining bits.

This fixes up merge-recursive.c for hashcpy/hashcmp changes.

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