Commit Graph

29966 Commits

Author SHA1 Message Date
Junio C Hamano
62033318ab Document "git commit"
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-09 22:28:23 -07:00
Junio C Hamano
0c091296c0 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>
2005-08-09 22:28:22 -07:00
Junio C Hamano
5ccfb758b0 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>
2005-08-09 22:28:21 -07:00
Johannes Schindelin
76cd8eb619 [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>
2005-08-09 22:28:21 -07:00
Martin Sivak
4852f7232b 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>
2005-08-09 22:28:20 -07:00
Junio C Hamano
763e287a35 Small typofix in mailsplit.c
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-09 22:28:20 -07:00
Junio C Hamano
79db12e8ba 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>
2005-08-09 22:28:19 -07:00
Timo Sirainen
4ec99bf080 [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.
2005-08-09 22:28:19 -07:00
Pavel Roskin
96ad15ae2f [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>
2005-08-09 22:28:18 -07:00
Kay Sievers
f7ab660c15 allow sorting of index page by project path, owner and age 2005-08-10 03:53:09 +02:00
Junio C Hamano
edee414c3e Merge with master.
This merges commit
    f10e0e0b18
from master into our head commit
    c3958a7926

Sincerely,
    jit-merge command.
2005-08-09 10:22:23 -07:00
Junio C Hamano
f10e0e0b18 Merge with gitk.
This merges commit
    b1ba39e7e8
from gitk into our head commit
    93b5fcdd8d

Sincerely,
    jit-merge command.
2005-08-09 10:21:09 -07:00
Junio C Hamano
93b5fcdd8d 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>
2005-08-09 10:16:12 -07:00
Linus Torvalds
b1ba39e7e8 [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>
2005-08-09 21:09:27 +10:00
Junio C Hamano
c3958a7926 Merge with master.
This merges commit
    c882bc932f
from master into our head commit
    e764a10b17

Sincerely,
    jit-merge command.
2005-08-08 22:57:57 -07:00
Chris Wright
c882bc932f [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>
2005-08-08 22:51:46 -07:00
Sergey Vlasov
adee7bdf50 [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>
2005-08-08 22:51:46 -07:00
Sergey Vlasov
7bf058f008 [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>
2005-08-08 22:51:46 -07:00
Sergey Vlasov
bfc66daf5c [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>
2005-08-08 22:51:45 -07:00
Sergey Vlasov
1cf58e7222 [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>
2005-08-08 22:51:45 -07:00
Holger Eitzenberger
35c3c62983 [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>
2005-08-08 22:51:44 -07:00
Catalin Marinas
affa40d2f8 [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>
2005-08-08 22:51:44 -07:00
Junio C Hamano
e764a10b17 Merge with master.
This merges commit
    3c4e8a636f
from master into our head commit
    80f45687f4

Sincerely,
    jit-merge command.
2005-08-08 18:02:39 -07:00
Junio C Hamano
3c4e8a636f 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>
2005-08-08 17:52:51 -07:00
Junio C Hamano
80f45687f4 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>
2005-08-08 15:03:39 -07:00
Junio C Hamano
b1d096f292 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>
2005-08-07 23:21:38 -07:00
Horst von Brand
24db845c40 [PATCH] RPM spec updates.
Fix description and clean up the spec file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-07 23:15:49 -07:00
Junio C Hamano
16cc55ce1f Merge with master.
This merges commit
    d59a6043a8
from master into our head commit
    1ff53bfdee

Sincerely,
    jit-merge command.
2005-08-07 17:10:50 -07:00
Junio C Hamano
d59a6043a8 Merge with gitk.
This merges commit
    fa4da7b32e
from gitk into our head commit
    6b7242aa1a

Sincerely,
    jit-merge command.
2005-08-07 17:10:20 -07:00
Paul Mackerras
fa4da7b32e 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.
2005-08-08 09:47:22 +10:00
Linus Torvalds
8b19280930 [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: fc54a9c30c  (Update git-apply-patch-script ...)
	Parent: 9e30dd7c0e  (Make git-prune-script executa ...)
	Parent: c4b83e618f  (Do not write out new index if ...)
	Parent: 660265909f  (diff-cache shows differences  ...)
	Parent: b28858bf65  (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>
2005-08-08 08:40:24 +10:00
Kay Sievers
e4669df9a6 Make the tag view look like commit header. 2005-08-08 00:02:39 +02:00
Junio C Hamano
1ff53bfdee Merge with master.
This merges commit
    6b7242aa1a
from master into our head commit
    f29eaed12f

Sincerely,
    jit-merge command.
2005-08-07 14:12:38 -07:00
Junio C Hamano
6b7242aa1a Merge with gitk.
This merges commit
    d6e8149bc5
from gitk into our head commit
    200e7fbbac

Sincerely,
    jit-merge command.
2005-08-07 14:11:08 -07:00
Junio C Hamano
200e7fbbac (revert local fix)
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-07 14:11:02 -07:00
Kay Sievers
f5dfb3f6a6 add README
Two files are better than one. :)
2005-08-07 22:39:58 +02:00
Kay Sievers
d263a6bd45 v236 2005-08-07 20:29:03 +02:00
Kay Sievers
d8a20ba9bc v235 2005-08-07 20:28:53 +02:00
Kay Sievers
f49201a995 v234 2005-08-07 20:28:42 +02:00
Kay Sievers
f6375b2452 v233 2005-08-07 20:28:33 +02:00
Kay Sievers
1b1cd42182 v232 2005-08-07 20:28:01 +02:00
Kay Sievers
d05c19eeb2 v229 2005-08-07 20:27:49 +02:00
Kay Sievers
4fac5294de v227 2005-08-07 20:27:38 +02:00
Kay Sievers
71be1e7948 v225 2005-08-07 20:27:27 +02:00
Kay Sievers
c994d620cc v220 2005-08-07 20:27:18 +02:00
Kay Sievers
ea4a6df408 v206 2005-08-07 20:26:49 +02:00
Kay Sievers
dcea8d0b84 v205 2005-08-07 20:26:38 +02:00
Kay Sievers
198066916a v203 2005-08-07 20:26:27 +02:00
Kay Sievers
1f22c26777 v165 2005-08-07 20:26:12 +02:00
Kay Sievers
2bf7a52c61 v164 2005-08-07 20:26:03 +02:00