gitweb.git
Merge with master.Junio C Hamano Wed, 10 Aug 2005 07:10:18 +0000 (00:10 -0700)

Merge with master.

This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305

Sincerely,
jit-merge command.

Skip merges in format-patch.Junio C Hamano Wed, 10 Aug 2005 07:06:16 +0000 (00:06 -0700)

Skip merges in format-patch.

Add -v option to git-cherry.Junio C Hamano Wed, 10 Aug 2005 06:58:35 +0000 (23:58 -0700)

Add -v option to git-cherry.

Teach git push .git/branches shorthandJunio C Hamano Mon, 8 Aug 2005 05:55:45 +0000 (22:55 -0700)

Teach git push .git/branches shorthand

Although it is uncertain if we would keep .git/branches for
long, the shorthand stored there can be used for pushing if it
is host:path/to/git format, so let's make use of it. This does
not use git-parse-remote because that script will be rewritten
quite a bit for updated pulling.

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

ls-remote: drop storing operation and add documentation.Junio C Hamano Mon, 8 Aug 2005 08:20:03 +0000 (01:20 -0700)

ls-remote: drop storing operation and add documentation.

The store operation was never useful because we needed to fetch
the objects needed to complete the reference. Remove it.

The fetch command fetch multiple references shortly to
replace the lost "store" functionality in more a generic way.

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

Teach format-patch, rebase and cherry a..b formatJunio C Hamano Sun, 7 Aug 2005 22:51:09 +0000 (15:51 -0700)

Teach format-patch, rebase and cherry a..b format

Although these commands take only begin and end, not necessarily
generic SHA1 expressions rev-parse supports, supporting a..b
notation is good for consistency. This commit adds such without
breaking backward compatibility.

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

Stash away the original head in ORIG_HEAD when resetting.Junio C Hamano Sun, 7 Aug 2005 03:59:47 +0000 (20:59 -0700)

Stash away the original head in ORIG_HEAD when resetting.

When rewinding the head, stash away the value of the original
HEAD in ORIG_HEAD, just like git-resolve-script does.

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

git-revert: revert an existing commit.Junio C Hamano Wed, 10 Aug 2005 05:30:17 +0000 (22:30 -0700)

git-revert: revert an existing commit.

Given one existing commit, revert the change the patch
introduces, and record a new commit that records it. This
requires your working tree to be clean (no modifications from
the HEAD commit).

This is based on what Linus posted to the list, with
enhancements he suggested, including the use of -M to attempt
reverting renames.

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

Introduce --pretty=oneline format.Junio C Hamano Tue, 9 Aug 2005 05:15:40 +0000 (22:15 -0700)

Introduce --pretty=oneline format.

This introduces --pretty=oneline to git-rev-tree and
git-rev-list commands to show only the first line of the commit
message, without frills.

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

Document "git commit"Junio C Hamano Tue, 9 Aug 2005 00:39:18 +0000 (17:39 -0700)

Document "git commit"

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

git-commit: log parameter updates.Junio C Hamano Tue, 9 Aug 2005 00:03:14 +0000 (17:03 -0700)

git-commit: log parameter updates.

While moving '-m' to make room for CVS compatible "here is the
log message", enhance source of log parameters.

-m 'message': a command line parameter.
-F <file> : a file (use '-' to read from stdin).
-C <commit> : message in existing commit.
-c <commit> : message in existing commit (allows further editing).

Longer option names for these options are also available.

While we are at it, get rid of shell array bashism.

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

Update rev-parse flags list.Junio C Hamano Tue, 9 Aug 2005 02:31:37 +0000 (19:31 -0700)

Update rev-parse flags list.

I haven't audited the rev-parse users, but I am having a feeling
that many of them would choke when they expect a couple of SHA1
object names and malicious user feeds them "--max-count=6" or
somesuch to shoot himself in the foot. Anyway, this adds a
couple of missing parameters that affect the list of revs to be
returned from rev-list, not the flags that affect how they are
presented by rev-list. I think that is the intention, but I am
not quite sure.

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

[PATCH] add *--no-merges* flag to suppress display... Johannes Schindelin Mon, 8 Aug 2005 09:37:21 +0000 (11:37 +0200)

[PATCH] add *--no-merges* flag to suppress display of merge commits

As requested by Junio (who suggested --single-parents-only, but this
could forget a no-parent root).

Also, adds a few missing options to the usage string.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use GIT_SSH environment to specify alternate ssh binary.Martin Sivak Wed, 3 Aug 2005 15:15:42 +0000 (17:15 +0200)

Use GIT_SSH environment to specify alternate ssh binary.

[jc: I ended up rewriting Martin's patch due to whitespace
breakage, but the credit goes to Martin for doing the initial
patch to identify what needs to be changed.]

Signed-off-by: Martin Sivak <mars@nomi.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Small typofix in mailsplit.cJunio C Hamano Wed, 10 Aug 2005 05:21:51 +0000 (22:21 -0700)

Small typofix in mailsplit.c

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

A bit more format warning squelching.Junio C Hamano Wed, 10 Aug 2005 04:25:46 +0000 (21:25 -0700)

A bit more format warning squelching.

Inspired by patch from Timo Sirainen. Most of them are not
strictly necessary but making warnings less chatty would help
spot real bugs later.

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

[PATCH] -Werror fixesTimo Sirainen Tue, 9 Aug 2005 15:30:22 +0000 (18:30 +0300)

[PATCH] -Werror fixes

GCC's format __attribute__ is good for checking errors, especially
with -Wformat=2 parameter. This fixes most of the reported problems
against 2005-08-09 snapshot.

[PATCH] Warning fix for gcc 4Pavel Roskin Tue, 9 Aug 2005 20:54:40 +0000 (16:54 -0400)

[PATCH] Warning fix for gcc 4

This patch fixes the only warning reported by gcc 4.0.1 on Fedora Core 4
for x86_64:

sha1_file.c:1391: warning: pointer targets in assignment differ in
signedness

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

allow sorting of index page by project path, owner... Kay Sievers Wed, 10 Aug 2005 01:53:09 +0000 (03:53 +0200)

allow sorting of index page by project path, owner and age

Merge with master.Junio C Hamano Tue, 9 Aug 2005 17:22:23 +0000 (10:22 -0700)

Merge with master.

This merges commit
f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
from master into our head commit
c3958a7926ab20b90fe0767580b466698477f5b6

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Tue, 9 Aug 2005 17:21:09 +0000 (10:21 -0700)

Merge with gitk.

This merges commit
b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69
from gitk into our head commit
93b5fcdd8ddaa7f55ce1a43d8b9eaed1d5febc98

Sincerely,
jit-merge command.

Downgrade git-send-email-scriptJunio C Hamano Tue, 9 Aug 2005 17:16:12 +0000 (10:16 -0700)

Downgrade git-send-email-script

RPM folks have problem installing the package otherwise. Since
its usefulness does have much to do with GIT, downgrade it to
"contrib" status for now. We may want to move it to contrib/
subdirectory after auditing other programs when we reorganize
the source tree.

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

[PATCH] "Child" information in commit window - and... Linus Torvalds Tue, 9 Aug 2005 03:04:20 +0000 (20:04 -0700)

[PATCH] "Child" information in commit window - and cleanups

This adds "Child: " lines to the commit window, which tells what children
a commit has.

It also cleans things up: it marks the text widget as no-wrap, which means
that it doesn't need to truncate the commit description arbitrarily by
hand. Also, the description itself is now done by a common helper routine
that handles both the parent and the children.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge with master.Junio C Hamano Tue, 9 Aug 2005 05:57:57 +0000 (22:57 -0700)

Merge with master.

This merges commit
c882bc932f6702a935c748893536356b0bba11ce
from master into our head commit
e764a10b17610ed9b3969bdb351e09f9635eb0ab

Sincerely,
jit-merge command.

[PATCH] Add -m <message> option to "git tag"Chris Wright Tue, 9 Aug 2005 00:04:42 +0000 (17:04 -0700)

[PATCH] Add -m <message> option to "git tag"

Allow users to create a tag message by passing message on command line
instead of requiring an $EDITOR session.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in git-pack-objectsSergey Vlasov Mon, 8 Aug 2005 18:46:58 +0000 (22:46 +0400)

[PATCH] Plug memory leak in git-pack-objects

find_deltas() should free its temporary objects before returning.

[jc: Sergey, if you have [PATCH] title on the Subject line of your
e-mail, please do not repeat it on the first line in your message
body. Thanks.]

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in sha1close()Sergey Vlasov Mon, 8 Aug 2005 18:46:13 +0000 (22:46 +0400)

[PATCH] Plug memory leak in sha1close()

sha1create() and sha1fd() malloc the returned struct sha1file;
sha1close() should free it.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in write_sha1_to_fd()Sergey Vlasov Mon, 8 Aug 2005 18:45:36 +0000 (22:45 +0400)

[PATCH] Plug memory leak in write_sha1_to_fd()

If the object to write was packed, both its uncompressed and compressed
data were leaked. If the object was not packed, its file was not unmapped.

[jc: I think it still leaks on the write error path of
write_sha1_to_fd(), but that should be fixable in a small separate
patch.]

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] Plug memory leak in read_object_with_reference()Sergey Vlasov Mon, 8 Aug 2005 18:44:43 +0000 (22:44 +0400)

[PATCH] Plug memory leak in read_object_with_reference()

When following a reference, read_object_with_reference() did not free the
intermediate object data.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>

[PATCH] git_mkstemp() fixHolger Eitzenberger Mon, 8 Aug 2005 20:33:08 +0000 (22:33 +0200)

[PATCH] git_mkstemp() fix

git_mkstemp() attempted to use TMPDIR environment variable, but it botched
copying the templates.

[jc: Holger, please add your own Signed-off-by line, and also if you can,
send in future patches as non attachments.]

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

[PATCH] Make curl fail on server errorCatalin Marinas Mon, 8 Aug 2005 09:53:23 +0000 (10:53 +0100)

[PATCH] Make curl fail on server error

Some http servers return an HTML error page and git reads it as normal
data. Adding -f option makes curl fail silently.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge with master.Junio C Hamano Tue, 9 Aug 2005 01:02:39 +0000 (18:02 -0700)

Merge with master.

This merges commit
3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
jit-merge command.

Makefile dependency fix.Junio C Hamano Mon, 8 Aug 2005 22:58:54 +0000 (15:58 -0700)

Makefile dependency fix.

Johannes Schindelin noticed that recent Makefile updates were
too eager to loosen dependencies.

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

Change RPM dependency from Prereq to Requires.Junio C Hamano Mon, 8 Aug 2005 22:03:39 +0000 (15:03 -0700)

Change RPM dependency from Prereq to Requires.

Sergey Vlasov says we do not pre-require (i.e. required packages
during installation) the dependencies, and should use Requires
instead of Prereq. Knowing nothing about RPM, I just believe
him.

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

Update Maintainer field of debian/controlJunio C Hamano Mon, 8 Aug 2005 06:21:38 +0000 (23:21 -0700)

Update Maintainer field of debian/control

My understanding is that having my name there is just as wrong
as having name of Linus, since neither of us is a debian
maintainer, but at least this would prevent people from bugging
Linus.

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

[PATCH] RPM spec updates.Horst von Brand Mon, 8 Aug 2005 03:18:19 +0000 (23:18 -0400)

[PATCH] RPM spec updates.

Fix description and clean up the spec file.

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

Merge with master.Junio C Hamano Mon, 8 Aug 2005 00:10:50 +0000 (17:10 -0700)

Merge with master.

This merges commit
d59a6043a8a7aed97c684fb4f14fe5221df1fcaf
from master into our head commit
1ff53bfdeea4d707571c9cae818888c070b51153

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Mon, 8 Aug 2005 00:10:20 +0000 (17:10 -0700)

Merge with gitk.

This merges commit
fa4da7b32e1197fa5032db6a2de7749868253f8b
from gitk into our head commit
6b7242aa1acc3c7835f80522914ffc4b2e789a29

Sincerely,
jit-merge command.

Better graph line details display and expand history... Paul Mackerras Sun, 7 Aug 2005 23:47:22 +0000 (09:47 +1000)

Better graph line details display and expand history coverage.

Now the history remembers when we have clicked on a graph line
and when we have asked for a diff between two commits, as well
as when we have displayed a commit.

The display when you click on a graph line now uses clickable
SHA1 IDs instead of the embedded "Go" buttons. Also made the
IDs clickable in the header for a diff between two commits.

[PATCH] gitk "parent information" in commit windowLinus Torvalds Sun, 7 Aug 2005 20:58:56 +0000 (13:58 -0700)

[PATCH] gitk "parent information" in commit window

This adds a useful "Parent:" line to the git commit information window.

It looks something like this (from the infamous octopus merge):

Author: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54
Committer: Junio C Hamano <junkio@cox.net> 2005-05-05 16:16:54
Parent: fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc (Update git-apply-patch-script ...)
Parent: 9e30dd7c0ecc9f10372f31539d0122db97418353 (Make git-prune-script executa ...)
Parent: c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a (Do not write out new index if ...)
Parent: 660265909fc178581ef327076716dfd3550e6e7b (diff-cache shows differences ...)
Parent: b28858bf65d4fd6d8bb070865518ec43817fe7f3 (Update diff engine for symlin ...)

Octopus merge of the following five patches.

Update git-apply-patch-script for symbolic links.
Make git-prune-script executable again.
Do not write out new index if nothing has changed.
diff-cache shows differences for unmerged paths without --cache.
Update diff engine for symlinks stored in the cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>
where all the parent commit ID's are clickable, because the new lines are
added as part of the "comment" string, and thus the regular clickability
thing will match them automatically.

I think this is good. And my random-tcl-monkey-skills are clearly getting
better (although it's perfectly possible that somebody who actually knows
what he is doing would have done things differently).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Make the tag view look like commit header.Kay Sievers Sun, 7 Aug 2005 22:02:39 +0000 (00:02 +0200)

Make the tag view look like commit header.

Merge with master.Junio C Hamano Sun, 7 Aug 2005 21:12:38 +0000 (14:12 -0700)

Merge with master.

This merges commit
6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
jit-merge command.

Merge with gitk.Junio C Hamano Sun, 7 Aug 2005 21:11:08 +0000 (14:11 -0700)

Merge with gitk.

This merges commit
d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa
from gitk into our head commit
200e7fbbac82b6665f8175af0e375fbef3568c30

Sincerely,
jit-merge command.

(revert local fix)Junio C Hamano Sun, 7 Aug 2005 21:11:02 +0000 (14:11 -0700)

(revert local fix)

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

add READMEKay Sievers Sun, 7 Aug 2005 20:39:58 +0000 (22:39 +0200)

add README

Two files are better than one. :)

v236Kay Sievers Sun, 7 Aug 2005 18:29:03 +0000 (20:29 +0200)

v236

v235Kay Sievers Sun, 7 Aug 2005 18:28:53 +0000 (20:28 +0200)

v235

v234Kay Sievers Sun, 7 Aug 2005 18:28:42 +0000 (20:28 +0200)

v234

v233Kay Sievers Sun, 7 Aug 2005 18:28:33 +0000 (20:28 +0200)

v233

v232Kay Sievers Sun, 7 Aug 2005 18:28:01 +0000 (20:28 +0200)

v232

v229Kay Sievers Sun, 7 Aug 2005 18:27:49 +0000 (20:27 +0200)

v229

v227Kay Sievers Sun, 7 Aug 2005 18:27:38 +0000 (20:27 +0200)

v227

v225Kay Sievers Sun, 7 Aug 2005 18:27:27 +0000 (20:27 +0200)

v225

v220Kay Sievers Sun, 7 Aug 2005 18:27:18 +0000 (20:27 +0200)

v220

v206Kay Sievers Sun, 7 Aug 2005 18:26:49 +0000 (20:26 +0200)

v206

v205Kay Sievers Sun, 7 Aug 2005 18:26:38 +0000 (20:26 +0200)

v205

v203Kay Sievers Sun, 7 Aug 2005 18:26:27 +0000 (20:26 +0200)

v203

v165Kay Sievers Sun, 7 Aug 2005 18:26:12 +0000 (20:26 +0200)

v165

v164Kay Sievers Sun, 7 Aug 2005 18:26:03 +0000 (20:26 +0200)

v164

v163Kay Sievers Sun, 7 Aug 2005 18:25:54 +0000 (20:25 +0200)

v163

v160Kay Sievers Sun, 7 Aug 2005 18:25:42 +0000 (20:25 +0200)

v160

v157Kay Sievers Sun, 7 Aug 2005 18:25:27 +0000 (20:25 +0200)

v157

v154Kay Sievers Sun, 7 Aug 2005 18:24:51 +0000 (20:24 +0200)

v154

v152Kay Sievers Sun, 7 Aug 2005 18:24:43 +0000 (20:24 +0200)

v152

v150Kay Sievers Sun, 7 Aug 2005 18:24:35 +0000 (20:24 +0200)

v150

v149Kay Sievers Sun, 7 Aug 2005 18:24:01 +0000 (20:24 +0200)

v149

v148Kay Sievers Sun, 7 Aug 2005 18:23:49 +0000 (20:23 +0200)

v148

v145Kay Sievers Sun, 7 Aug 2005 18:23:35 +0000 (20:23 +0200)

v145

v143Kay Sievers Sun, 7 Aug 2005 18:23:24 +0000 (20:23 +0200)

v143

v142Kay Sievers Sun, 7 Aug 2005 18:23:12 +0000 (20:23 +0200)

v142

v136Kay Sievers Sun, 7 Aug 2005 18:22:53 +0000 (20:22 +0200)

v136

v133Kay Sievers Sun, 7 Aug 2005 18:22:44 +0000 (20:22 +0200)

v133

v125Kay Sievers Sun, 7 Aug 2005 18:21:46 +0000 (20:21 +0200)

v125

v121Kay Sievers Sun, 7 Aug 2005 18:21:34 +0000 (20:21 +0200)

v121

v118Kay Sievers Sun, 7 Aug 2005 18:21:23 +0000 (20:21 +0200)

v118

v107Kay Sievers Sun, 7 Aug 2005 18:21:04 +0000 (20:21 +0200)

v107

v089Kay Sievers Sun, 7 Aug 2005 18:20:20 +0000 (20:20 +0200)

v089

v088Kay Sievers Sun, 7 Aug 2005 18:20:07 +0000 (20:20 +0200)

v088

v085Kay Sievers Sun, 7 Aug 2005 18:19:56 +0000 (20:19 +0200)

v085

v082Kay Sievers Sun, 7 Aug 2005 18:19:45 +0000 (20:19 +0200)

v082

v080Kay Sievers Sun, 7 Aug 2005 18:18:44 +0000 (20:18 +0200)

v080

v078Kay Sievers Sun, 7 Aug 2005 18:18:30 +0000 (20:18 +0200)

v078

v077Kay Sievers Sun, 7 Aug 2005 18:18:13 +0000 (20:18 +0200)

v077

v073Kay Sievers Sun, 7 Aug 2005 18:18:01 +0000 (20:18 +0200)

v073

v071Kay Sievers Sun, 7 Aug 2005 18:17:50 +0000 (20:17 +0200)

v071

v070Kay Sievers Sun, 7 Aug 2005 18:17:42 +0000 (20:17 +0200)

v070

v064Kay Sievers Sun, 7 Aug 2005 18:17:19 +0000 (20:17 +0200)

v064

v063Kay Sievers Sun, 7 Aug 2005 18:17:09 +0000 (20:17 +0200)

v063

v062Kay Sievers Sun, 7 Aug 2005 18:17:00 +0000 (20:17 +0200)

v062

v057Kay Sievers Sun, 7 Aug 2005 18:16:07 +0000 (20:16 +0200)

v057

v056Kay Sievers Sun, 7 Aug 2005 18:15:57 +0000 (20:15 +0200)

v056

v055Kay Sievers Sun, 7 Aug 2005 18:15:44 +0000 (20:15 +0200)

v055

v053Kay Sievers Sun, 7 Aug 2005 18:14:48 +0000 (20:14 +0200)

v053

rename gitweb.pl to gitweb.cgi

v049Kay Sievers Sun, 7 Aug 2005 18:13:11 +0000 (20:13 +0200)

v049

v048Kay Sievers Sun, 7 Aug 2005 18:13:02 +0000 (20:13 +0200)

v048

v043Kay Sievers Sun, 7 Aug 2005 18:12:11 +0000 (20:12 +0200)

v043

v042Kay Sievers Sun, 7 Aug 2005 18:09:33 +0000 (20:09 +0200)

v042

v041Kay Sievers Sun, 7 Aug 2005 18:08:29 +0000 (20:08 +0200)

v041

v041Kay Sievers Sun, 7 Aug 2005 18:08:03 +0000 (20:08 +0200)

v041

v035Kay Sievers Sun, 7 Aug 2005 18:06:09 +0000 (20:06 +0200)

v035