Commits

Show all
Author Commit Message Labels Comments Date
Sergey Vlasov
[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>
Sergey Vlasov
[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>
Sergey Vlasov
[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>
Sergey Vlasov
[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>
Holger Eitzenberger
[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>
Catalin Marinas
[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>
Junio C Hamano
Merge with master. This merges commit 3c4e8a636f4de3668b24d0020df731cdc78ae6e9 from master into our head commit 80f45687f44b6258b0eacae6b1ae15e3ad4a6552 Sincerely, jit-merge command.
Junio C Hamano
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>
Junio C Hamano
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>
Junio C Hamano
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>
Horst H. von Brand
[PATCH] RPM spec updates. Fix description and clean up the spec file. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge with master. This merges commit d59a6043a8a7aed97c684fb4f14fe5221df1fcaf from master into our head commit 1ff53bfdeea4d707571c9cae818888c070b51153 Sincerely, jit-merge command.
Junio C Hamano
Merge with gitk. This merges commit fa4da7b32e1197fa5032db6a2de7749868253f8b from gitk into our head commit 6b7242aa1acc3c7835f80522914ffc4b2e789a29 Sincerely, jit-merge command.
Paul Mackerras
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.
Linus Torvalds
[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: 9e30dd7c0ecc9f10372f31539d0122db9741835…
Junio C Hamano
Merge with master. This merges commit 6b7242aa1acc3c7835f80522914ffc4b2e789a29 from master into our head commit f29eaed12fc07bc5b2e4d1a302136a26ff4488ce Sincerely, jit-merge command.
Junio C Hamano
Merge with gitk. This merges commit d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa from gitk into our head commit 200e7fbbac82b6665f8175af0e375fbef3568c30 Sincerely, jit-merge command.
Junio C Hamano
(revert local fix) Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
Use lf translation rather than binary when reading commit data. The effect of this is that it allows Tcl to do the locale-specific conversion of the input data to its internal unicode representation. That means that commit messages in Russian or other languages should be displayed correctly now (according to the locale that is in effect.)
Junio C Hamano
Fix build rules for debian package. Run install-tools target to install the tools to accept e-mail patches. Also clean up the main Makefile a bit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
Change cursor to a hand cursor when over a SHA1 ID link. This is based on suggestions by Jeff Epler and Linus Torvalds, but extended so that we do the switching between the watch cursor and the normal cursor correctly as well. Also fixed a bug pointed out by Junio Hamano - I wasn't incrementing the link number (duh!).
Junio C Hamano
Fix RPM build that omitted templates and tools. Many many thanks go to Chris Wright and H. Peter Anvin whose help were essential to get me going this build. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge with master. This merges commit bfe19f876cb20bea606e1a698030c017f31965c1 from master into our head commit 7a59013290bb26b80c997e5698757a735f1a92e0 Sincerely, jit-merge command.
Linus Torvalds
[PATCH] Extend "git reset" to take a reset point This was triggered by a query by Sam Ravnborg, and extends "git reset" to reset the index and the .git/HEAD pointer to an arbitrarily named point. For example git reset HEAD^ will just reset the current HEAD to its own parent - leaving the working directory untouched, but effectively un-doing the top-most commit. You might want to do this if you realize after you committed that you made a mist…
Junio C Hamano
GIT 0.99.4 (release candidate) This is my first attempt to adjust Debian and RPM to pass prefix, to prepare the 0.99.4 release. It updates debian/rules and git-core.spec.in to properly pass prefix when building binary packages. It also updates debian/changelog to make the resulting binary package name 0.99.4; this is not needed on the RPM side (it takes the version number from the main Makefile). Signed-off-by: Junio C Haman…
Junio C Hamano
Redo the templates generation and installation. Per discussion with people interested in binary packaging, change the default template location from /etc/git-core to /usr/share/git-core hierarchy. If a user wants to run git before installing for whatever reason, in addition to adding $src to the PATH environment variable, git-init-db can be run with --template=$src/templates/blt/ parameter. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
gitk proposed fix: handle more than one SHA1 links. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
send-pack: allow generic sha1 expression on the source side. This extends the source side semantics to match what Linus suggested. An example: $ git-send-pack kernel.org:/pub/scm/git/git.git pu^^:master pu would allow me to push the current pu into pu, and the commit two commits before it into master, on my public repository. The revised rule for updating remote heads is as follows. $ git-send-pack [--all] <remote> [<ref>...] - When …
Junio C Hamano
send-pack: allow the same source to be pushed more than once. The revised code accidentally inherited the restriction that a reference can be pushed only once, only because the original did not allow renaming. This is no longer necessary so lift it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
[PATCH] Make git-sh-setup-script do what it was supposed to do Duh. A missing && meant that half the tests that git-sh-setup-script were _meant_ to do were actually totally ignored. In particular, the git sanity checking ended up only testing that the GIT_OBJECT_DIRECTORY was sane, not that GIT_DIR itself was.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next