| bf57030 | Junio C Hamano | 10 August 2005, 21:43:08 UTC | GIT 0.99.4. Mark it official. Finally. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 August 2005, 21:43:08 UTC |
| df6a6f0 | Junio C Hamano | 10 August 2005, 20:20:08 UTC | Merge with master. This merges commit e8c80638abc99928dba9ac832589749a531e2e21 from master into our head commit bdb71a41caa9ffed2e3207736c21fffbc2007670 Sincerely, jit-merge command. | 10 August 2005, 20:20:08 UTC |
| e8c8063 | Junio C Hamano | 10 August 2005, 20:18:11 UTC | Merge with gitk. This merges commit 466e4fdd6696c89700294e1a54fa73e1fb94643b from gitk into our head commit ef0bd2e6e643f09a8294937caf99463328b9215a Sincerely, jit-merge command. | 10 August 2005, 20:18:11 UTC |
| bdb71a4 | Junio C Hamano | 10 August 2005, 17:55:54 UTC | Merge with master. This merges commit ef0bd2e6e643f09a8294937caf99463328b9215a from master into our head commit f69714c38c6f3296a4bfba0d057e0f1605373f49 Sincerely, jit-merge command. | 10 August 2005, 17:55:54 UTC |
| ef0bd2e | Johannes Schindelin | 10 August 2005, 03:07:36 UTC | [PATCH] Fix git-rev-parse's parent handling git-rev-parse HEAD^1 would fail, because of an off-by-one bug (but HEAD^ would yield the expected result). Also, when the parent does not exist, do not silently return an incorrect SHA1. Of course, this no longer applies to git-rev-parse alone, but every user of get_sha1(). While at it, add a test. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 August 2005, 17:22:49 UTC |
| 466e4fd | Paul Mackerras | 10 August 2005, 12:50:28 UTC | Only do an update every 100 commits when drawing the graph. On a large repository with > 60,000 commits, each call to the Tk update primitive (which gives Tk a chance to respond to events and redraw the screen) was taking up to 0.2 seconds. Because the logic was to call update after drawing a commit if 0.1 seconds had passed since the last update call, we were calling it for every commit, which was slowing us down enormously. Now we also require that we have drawn 100 commits since the last update (as well as it being at least 0.1 seconds since the last update). Drawing 100 commits takes around 0.1 - 0.2 seconds (even in this large repo) on my G5. | 10 August 2005, 12:50:28 UTC |
| f69714c | Junio C Hamano | 10 August 2005, 07:10:18 UTC | Merge with master. This merges commit c35a7b8d806317dc1762e36561cbd31c2530dd9c from master into our head commit edee414c3e5a546aae3dd1529f397df949713305 Sincerely, jit-merge command. | 10 August 2005, 07:10:18 UTC |
| c35a7b8 | Junio C Hamano | 10 August 2005, 07:06:16 UTC | Skip merges in format-patch. | 10 August 2005, 07:06:56 UTC |
| 185612b | Junio C Hamano | 10 August 2005, 06:58:35 UTC | Add -v option to git-cherry. | 10 August 2005, 07:00:22 UTC |
| 46b1c7c | Junio C Hamano | 08 August 2005, 05:55:45 UTC | 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> | 10 August 2005, 06:38:51 UTC |
| 972b6fe | Junio C Hamano | 08 August 2005, 08:20:03 UTC | 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> | 10 August 2005, 06:38:51 UTC |
| 4282c4f | Junio C Hamano | 07 August 2005, 22:51:09 UTC | 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> | 10 August 2005, 06:38:50 UTC |
| 32173e6 | Junio C Hamano | 07 August 2005, 03:59:47 UTC | 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> | 10 August 2005, 06:38:49 UTC |
| 045f82c | Junio C Hamano | 10 August 2005, 05:30:17 UTC | 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> | 10 August 2005, 06:38:49 UTC |
| d87449c | Junio C Hamano | 09 August 2005, 05:15:40 UTC | 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> | 10 August 2005, 05:28:23 UTC |
| 6203331 | Junio C Hamano | 09 August 2005, 00:39:18 UTC | Document "git commit" Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 August 2005, 05:28:23 UTC |
| 0c09129 | Junio C Hamano | 09 August 2005, 00:03:14 UTC | 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> | 10 August 2005, 05:28:22 UTC |
| 5ccfb75 | Junio C Hamano | 09 August 2005, 02:31:37 UTC | 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> | 10 August 2005, 05:28:21 UTC |
| 76cd8eb | Johannes Schindelin | 08 August 2005, 09:37:21 UTC | [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> | 10 August 2005, 05:28:21 UTC |
| 4852f72 | Martin Sivak | 03 August 2005, 15:15:42 UTC | 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> | 10 August 2005, 05:28:20 UTC |
| 763e287 | Junio C Hamano | 10 August 2005, 05:21:51 UTC | Small typofix in mailsplit.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 August 2005, 05:28:20 UTC |
| 79db12e | Junio C Hamano | 10 August 2005, 04:25:46 UTC | 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> | 10 August 2005, 05:28:19 UTC |
| 4ec99bf | Timo Sirainen | 09 August 2005, 15:30:22 UTC | [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. | 10 August 2005, 05:28:19 UTC |
| 96ad15a | Pavel Roskin | 09 August 2005, 20:54:40 UTC | [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> | 10 August 2005, 05:28:18 UTC |
| edee414 | Junio C Hamano | 09 August 2005, 17:22:23 UTC | Merge with master. This merges commit f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda from master into our head commit c3958a7926ab20b90fe0767580b466698477f5b6 Sincerely, jit-merge command. | 09 August 2005, 17:22:23 UTC |
| f10e0e0 | Junio C Hamano | 09 August 2005, 17:21:09 UTC | Merge with gitk. This merges commit b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69 from gitk into our head commit 93b5fcdd8ddaa7f55ce1a43d8b9eaed1d5febc98 Sincerely, jit-merge command. | 09 August 2005, 17:21:09 UTC |
| 93b5fcd | Junio C Hamano | 09 August 2005, 17:16:12 UTC | 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> | 09 August 2005, 17:16:12 UTC |
| b1ba39e | Linus Torvalds | 09 August 2005, 03:04:20 UTC | [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> | 09 August 2005, 11:09:27 UTC |
| c3958a7 | Junio C Hamano | 09 August 2005, 05:57:57 UTC | Merge with master. This merges commit c882bc932f6702a935c748893536356b0bba11ce from master into our head commit e764a10b17610ed9b3969bdb351e09f9635eb0ab Sincerely, jit-merge command. | 09 August 2005, 05:57:57 UTC |
| c882bc9 | Chris Wright | 09 August 2005, 00:04:42 UTC | [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> | 09 August 2005, 05:51:46 UTC |
| adee7bd | Sergey Vlasov | 08 August 2005, 18:46:58 UTC | [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> | 09 August 2005, 05:51:46 UTC |
| 7bf058f | Sergey Vlasov | 08 August 2005, 18:46:13 UTC | [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> | 09 August 2005, 05:51:46 UTC |
| bfc66da | Sergey Vlasov | 08 August 2005, 18:45:36 UTC | [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> | 09 August 2005, 05:51:45 UTC |
| 1cf58e7 | Sergey Vlasov | 08 August 2005, 18:44:43 UTC | [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> | 09 August 2005, 05:51:45 UTC |
| 35c3c62 | Holger Eitzenberger | 08 August 2005, 20:33:08 UTC | [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> | 09 August 2005, 05:51:44 UTC |
| affa40d | Catalin Marinas | 08 August 2005, 09:53:23 UTC | [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> | 09 August 2005, 05:51:44 UTC |
| e764a10 | Junio C Hamano | 09 August 2005, 01:02:39 UTC | Merge with master. This merges commit 3c4e8a636f4de3668b24d0020df731cdc78ae6e9 from master into our head commit 80f45687f44b6258b0eacae6b1ae15e3ad4a6552 Sincerely, jit-merge command. | 09 August 2005, 01:02:39 UTC |
| 3c4e8a6 | Junio C Hamano | 08 August 2005, 22:58:54 UTC | 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> | 09 August 2005, 00:52:51 UTC |
| 80f4568 | Junio C Hamano | 08 August 2005, 22:03:39 UTC | 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> | 08 August 2005, 22:03:39 UTC |
| b1d096f | Junio C Hamano | 08 August 2005, 06:21:38 UTC | 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> | 08 August 2005, 06:21:38 UTC |
| 24db845 | Horst von Brand | 08 August 2005, 03:18:19 UTC | [PATCH] RPM spec updates. Fix description and clean up the spec file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 August 2005, 06:15:49 UTC |
| 16cc55c | Junio C Hamano | 08 August 2005, 00:10:50 UTC | Merge with master. This merges commit d59a6043a8a7aed97c684fb4f14fe5221df1fcaf from master into our head commit 1ff53bfdeea4d707571c9cae818888c070b51153 Sincerely, jit-merge command. | 08 August 2005, 00:10:50 UTC |
| d59a604 | Junio C Hamano | 08 August 2005, 00:10:20 UTC | Merge with gitk. This merges commit fa4da7b32e1197fa5032db6a2de7749868253f8b from gitk into our head commit 6b7242aa1acc3c7835f80522914ffc4b2e789a29 Sincerely, jit-merge command. | 08 August 2005, 00:10:20 UTC |
| fa4da7b | Paul Mackerras | 07 August 2005, 23:47:22 UTC | 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. | 07 August 2005, 23:47:22 UTC |
| 8b19280 | Linus Torvalds | 07 August 2005, 20:58:56 UTC | [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> | 07 August 2005, 22:40:24 UTC |
| 1ff53bf | Junio C Hamano | 07 August 2005, 21:12:38 UTC | Merge with master. This merges commit 6b7242aa1acc3c7835f80522914ffc4b2e789a29 from master into our head commit f29eaed12fc07bc5b2e4d1a302136a26ff4488ce Sincerely, jit-merge command. | 07 August 2005, 21:12:38 UTC |
| 6b7242a | Junio C Hamano | 07 August 2005, 21:11:08 UTC | Merge with gitk. This merges commit d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa from gitk into our head commit 200e7fbbac82b6665f8175af0e375fbef3568c30 Sincerely, jit-merge command. | 07 August 2005, 21:11:08 UTC |
| 200e7fb | Junio C Hamano | 07 August 2005, 21:11:02 UTC | (revert local fix) Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 August 2005, 21:11:02 UTC |
| d6e8149 | Paul Mackerras | 07 August 2005, 10:01:24 UTC | 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.) | 07 August 2005, 10:01:24 UTC |
| f29eaed | Junio C Hamano | 07 August 2005, 05:29:21 UTC | 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> | 07 August 2005, 05:29:21 UTC |
| 94a2eed | Paul Mackerras | 07 August 2005, 05:27:57 UTC | 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!). | 07 August 2005, 05:27:57 UTC |
| d5928d6 | Junio C Hamano | 07 August 2005, 03:38:13 UTC | 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> | 07 August 2005, 03:54:49 UTC |
| 55bc3fe | Junio C Hamano | 07 August 2005, 03:54:43 UTC | Merge with master. This merges commit bfe19f876cb20bea606e1a698030c017f31965c1 from master into our head commit 7a59013290bb26b80c997e5698757a735f1a92e0 Sincerely, jit-merge command. | 07 August 2005, 03:54:43 UTC |
| bfe19f8 | Linus Torvalds | 07 August 2005, 01:01:03 UTC | [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 mistake that you want to fix up: reset your HEAD back to its previous state, fix up the working directory and re-do the commit. If you want to totally un-do the commit (and reset your working directory to that point too), you'd first use "git reset HEAD^" to reset to the parent, and then do a "git checkout -f" to reset the working directory state to that point in time too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 August 2005, 03:44:20 UTC |
| 7a59013 | Junio C Hamano | 06 August 2005, 20:10:43 UTC | 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 Hamano <junkio@cox.net> | 07 August 2005, 00:23:52 UTC |
| d3af621 | Junio C Hamano | 06 August 2005, 19:50:14 UTC | 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> | 06 August 2005, 20:49:26 UTC |
| f5b7495 | Junio C Hamano | 06 August 2005, 16:28:31 UTC | gitk proposed fix: handle more than one SHA1 links. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 17:19:39 UTC |
| 15e02b3 | Junio C Hamano | 06 August 2005, 17:12:03 UTC | 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 no <ref> is specified: - with '--all', it is the same as specifying the full refs/* path for all local refs; - without '--all', it is the same as specifying the full refs/* path for refs that exist on both ends; - When one or more <ref>s are specified: - a single token <ref> (i.e. no colon) must be a pattern that tail-matches refs/* path for an existing local ref. It is an error for the pattern to match no local ref, or more than one local refs. The matching ref is pushed to the remote end under the same name. - <src>:<dst> can have different cases. <src> is first tried as the tail-matching pattern for refs/* path. - If more than one matches are found, it is an error. - If one match is found, <dst> must either match no remote ref and start with "refs/", or match exactly one remote ref. That remote ref is updated with the sha1 value obtained from the <src> sha1. - If no match is found, it is given to get_extended_sha1(); it is an error if get_extended_sha1() does not find an object name. If it succeeds, <dst> must either match no remote ref and start with "refs/" or match exactly one remote ref. That remote ref is updated with the sha1 value. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 17:19:38 UTC |
| db27ee6 | Junio C Hamano | 06 August 2005, 17:16:52 UTC | 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> | 06 August 2005, 17:19:38 UTC |
| e4ad5f0 | Linus Torvalds | 06 August 2005, 17:04:50 UTC | [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> | 06 August 2005, 17:19:17 UTC |
| 3f81fc8 | Junio C Hamano | 06 August 2005, 16:24:15 UTC | Merge with gitk. This merges commit d698206c12a4680a92c5f4894f0345dc7dcfe62a from gitk into our head commit 2c6e4771959dbe8116f39587d912f1215c06cd0d Sincerely, jit-merge command. | 06 August 2005, 16:24:15 UTC |
| d698206 | Paul Mackerras | 06 August 2005, 12:06:06 UTC | Add forward and back buttons and make SHA1 IDs clickable links. When we display the commit message in the details pane, any string of 40 [0-9a-f] characters that corresponds to a SHA1 ID that we know about gets turned into a clickable link, and displayed in blue and underlined. We now keep a history of commits that we have looked at, and we have forward and back buttons for moving within the history list. | 06 August 2005, 12:06:06 UTC |
| 2c6e477 | Johannes Schindelin | 05 August 2005, 15:05:02 UTC | [PATCH] Assorted documentation patches [jc: Johannes spent time and effort to see how consistent our use of terminilogy is, and as a byproduct made these corrections not related to the terminology unification. I really appreciate it.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 06:07:00 UTC |
| eca35ec | Johannes Schindelin | 05 August 2005, 15:34:38 UTC | [PATCH] git-commit-script fix for degenerated merge If merging results in an unchanged tree, git-commit-script should not complain that there's nothing to commit. Also, add "[--all]" to usage(). [jc: usually there is no reason to record an unchanging merge, but this code path is triggered only when there is a nontrivial merge that needed to be resolved by hand, and we should be able to record the fact that these two tree heads are dealt with as a regular two-parent commit in order to help later merges.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 06:06:58 UTC |
| 64f8a63 | Holger Eitzenberger | 04 August 2005, 20:49:49 UTC | [PATCH] git: use git_mkstemp() instead of mkstemp() for diff generation. This lets you run git diff in a repository otherwise read-only to you. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 06:06:58 UTC |
| f2db68e | Holger Eitzenberger | 04 August 2005, 20:43:03 UTC | [PATCH] git: add git_mkstemp() Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 06:06:58 UTC |
| 51b0fca | Junio C Hamano | 06 August 2005, 06:05:33 UTC | Fix ref_newer() in send-pack. When more than two references need to be checked with ref_newer() function, the second and later calls did not work correctly. This was because the later calls found commits retained by the "struct object" layer that still had smudges made by earlier calls. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 August 2005, 06:05:33 UTC |
| 4fa1604 | Junio C Hamano | 05 August 2005, 23:50:54 UTC | Fix refname termination. When a new ref is being pushed, the name of it was not terminated properly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 23:50:54 UTC |
| b32e986 | Petr Baudis | 04 August 2005, 22:31:12 UTC | [PATCH] Fix git-merge-cache -q I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 20:53:17 UTC |
| b50abe8 | Junio C Hamano | 29 July 2005, 22:37:11 UTC | git-applymbox: allow retrying after fixing up. After failing to apply a patch, when operating under -q (query) flag, give the user an opportunity to fix up the patch in a separate window and retry. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 08:39:15 UTC |
| 638ccfd | Junio C Hamano | 05 August 2005, 08:39:07 UTC | Merge with gitk. | 05 August 2005, 08:39:07 UTC |
| 1eef0b3 | Junio C Hamano | 26 July 2005, 20:26:52 UTC | daemon.c: squelch error message from EINTR Every time after servicing the connection, select() first fails with EINTR and ends up waiting for one second before serving the next client. The sleep() was placed by the original author per suggestion from the list to avoid spinning on failing select, but at least this EINTR situation should not result in "at most one client per second" service limit. I am not sure if this is the right fix, but WTH. The king penguin says that serious people would run the daemon under inetd anyway, and I agree with that. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 08:27:13 UTC |
| 1215879 | Junio C Hamano | 04 August 2005, 09:31:15 UTC | Teach rev-list since..til notation. The King Penguin says: Now, for extra bonus points, maybe you should make "git-rev-list" also understand the "rev..rev" format (which you can't do with just the get_sha1() interface, since it expands into more). The faithful servant makes it so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 08:25:31 UTC |
| 9938af6 | Junio C Hamano | 04 August 2005, 05:15:49 UTC | Update get_sha1() to grok extended format. Everybody envies rev-parse, who is the only one that can grok the extended sha1 format. Move the get_extended_sha1() out of rev-parse, rename it to get_sha1() and make it available to everybody else. The one I posted earlier to the list had one bug where it did not handle a name that ends with a digit correctly (it incorrectly tried the "Nth parent" path). This commit fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 07:51:07 UTC |
| 37fde87 | Junio C Hamano | 05 August 2005, 07:47:56 UTC | Fix send-pack for non-commitish tags. Again I left the v2.6.11-tree tag behind. My bad. This commit makes sure that we do not barf when pushing a ref that is a non-commitish tag. You can update a remote ref under the following conditions: * You can always use --force. * Creating a brand new ref is OK. * If the remote ref is exactly the same as what you are pushing, it is OK (nothing is pushed). * You can replace a commitish with another commitish which is a descendant of it, if you can verify the ancestry between them; this and the above means you have to have what you are replacing. * Otherwise you cannot update; you need to use --force. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 07:47:56 UTC |
| b03e2d2 | Junio C Hamano | 05 August 2005, 04:43:43 UTC | git-init-db: brown paper bag bugfix. OK, I admit I am an idiot. I ended up creating bunch of garbage directories like .git/HEADbranch/ .git/HEADrefs/... Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 August 2005, 04:43:43 UTC |
| 8d858d1 | Paul Mackerras | 04 August 2005, 23:52:16 UTC | Compress the graph horizontally if it gets too wide. If the graph gets to use more than a certain percentage (default 50%) of the width of the top-left pane, we now reduce the amount of space allowed for each graph line. This means it doesn't look quite as nice but you can still see the headline for the commit. (Currently the only way to customize the percentage is to edit your ~/.gitk file manually.) | 04 August 2005, 23:52:16 UTC |
| 7f47e72 | Junio C Hamano | 04 August 2005, 08:17:05 UTC | git-bisect termination condition fix. When I munged the original from Linus, which did not terminate when the last bisect to check happened to be a bad one, to terminate, I seem to have botched the end result to pick. Thanks for Sanjoy Mahajan for a good reproduction recipe to diagnose this. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 09:46:46 UTC |
| 0dd385c | Junio C Hamano | 04 August 2005, 08:49:03 UTC | Retire git-check-files documentation too. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 09:46:45 UTC |
| 635d37a | Alecs King | 04 August 2005, 03:35:37 UTC | [PATCH] Fix sparse warnings fix one 'should it be static?' warning and two 'mixing declarations and code' warnings. Signed-off-by: Alecs King <alecsk@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 04:41:56 UTC |
| 20f6633 | Junio C Hamano | 04 August 2005, 02:13:52 UTC | Retire check-files. The king penguin said: It has no point any more, all the tools check the file status on their own, and yes, the thing should probably be removed. and the faithful servant makes it so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 04:41:55 UTC |
| a765c99 | Kalle Valo | 03 August 2005, 23:39:48 UTC | [PATCH] Fix debian doc-base Fixed location of HTML documents in debian doc-base file. Without this fix debian package won't install properly (complains about missing /usr/share/doc/git-core/html directory). jc: thanks, Kalle. I think debian/rules is still broken around etcdir area, though. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 04:41:38 UTC |
| 9553d20 | Junio C Hamano | 04 August 2005, 00:15:44 UTC | git-send-pack: documentation Describe the renaming push. The wording is horrible and I would appreciate a rewrite, but it is better than nothing ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 00:16:30 UTC |
| f88395a | Junio C Hamano | 03 August 2005, 23:35:29 UTC | Renaming push. This allows git-send-pack to push local refs to a destination repository under different names. Here is the name mapping rules for refs. * If there is no ref mapping on the command line: - if '--all' is specified, it is equivalent to specifying <local> ":" <local> for all the existing local refs on the command line - otherwise, it is equivalent to specifying <ref> ":" <ref> for all the refs that exist on both sides. * <name> is just a shorthand for <name> ":" <name> * <src> ":" <dst> push ref that matches <src> to ref that matches <dst>. - It is an error if <src> does not match exactly one of local refs. - It is an error if <dst> matches more than one remote refs. - If <dst> does not match any remote refs, either - it has to start with "refs/"; <dst> is used as the destination literally in this case. - <src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination. For example, - "git-send-pack --all <remote>" works exactly as before; - "git-send-pack <remote> master:upstream" pushes local master to remote ref that matches "upstream". If there is no such ref, it is an error. - "git-send-pack <remote> master:refs/heads/upstream" pushes local master to remote refs/heads/upstream, even when refs/heads/upstream does not exist. - "git-send-pack <remote> master" into an empty remote repository pushes the local ref/heads/master to the remote ref/heads/master. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 August 2005, 00:16:29 UTC |
| 8d5afef | Junio C Hamano | 02 August 2005, 23:45:21 UTC | Install sample hooks A template mechanism to populate newly initialized repository with default set of files is introduced. Use it to ship example hooks that can be used for update and post update checks, as Josef Weidendorfer suggests. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 23:27:38 UTC |
| ee63914 | Sergey Vlasov | 03 August 2005, 12:11:00 UTC | [PATCH] Plug memory leaks in git-unpack-objects - Call inflateEnd to release zlib state after use. - After resolving delta, free base object data. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 19:57:55 UTC |
| 40b64d4 | Junio C Hamano | 03 August 2005, 19:41:12 UTC | send-pack: handle partial pushes correctly. When pushing into multi-user repository, or when pushing to a repository from a local repository that has rebased branches that has been pruned, the destination repository can have head commits that are missing from the local repository. This should not matter as long as the local head of the branch being pushed is a proper superset of the destination branch, but we ended up trying to run rev-list telling it to exclude objects reachable from those heads missing from the local repository, causing it to barf. Prune those heads from the rev-list parameter list, and make sure we do not try to push a branch whose remote head is something we lack. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 19:41:12 UTC |
| 5825e5b | Junio C Hamano | 01 August 2005, 06:05:16 UTC | git-send-email-script: minimum whitespace cleanup. Now it is ready to hit the "master" branch, clean up the script for trailing whitespace and mixture of tabs and spaces. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:28 UTC |
| a6d62cd | Ryan Anderson | 03 August 2005, 01:45:22 UTC | [PATCH] Doc: update git-send-email-script documentation. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:27 UTC |
| e205735 | Ryan Anderson | 03 August 2005, 01:45:22 UTC | [PATCH] git-send-email-script - Fix loops that limit emails to unique values to be pedantically correct. Email addresses aren't generally case sensitive in the real world, but technically, they *can* be. So, let's do the right thing. Additionally, fix the generated message-id to have the right template used. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:26 UTC |
| ca9a7d6 | Ryan Anderson | 01 August 2005, 00:04:25 UTC | [PATCH] git-send-email-script - fix 2 small bugs that snuck through an untested bout of editing. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:25 UTC |
| 3342d85 | Ryan Anderson | 01 August 2005, 00:04:24 UTC | [PATCH] Make the SMTP server used by git-sendm-email-script configurable on the command line with "--smtp-server" git-send-email-script | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) a21efe6d21d9f1aca09453ed2a4e2a2ff2d98ce6 Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:23 UTC |
| 8037d1a | Ryan Anderson | 01 August 2005, 00:04:24 UTC | [PATCH] git-send-email-script: Reformat readline interface and generate a better message-id. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:22 UTC |
| 78488b2 | Ryan Anderson | 01 August 2005, 00:04:24 UTC | [PATCH] Add "--chain-reply-to" to git-send-email-script, to control whether or not the Note, using --no-chain-reply-to means you probably want to put a special message into the first email you send, i.e, a 0/N patch cover sheet. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:18 UTC |
| f3d9f35 | Ryan Anderson | 01 August 2005, 00:04:24 UTC | [PATCH] Cleanup initial comments, add copyright notices. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:17 UTC |
| 9133261 | Ryan Anderson | 01 August 2005, 00:04:24 UTC | [PATCH] Convert from using quoted-printable to just 8bit encoding on all emails. (Deleted some spurious comments) Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:16 UTC |
| 6ff3376 | Ryan Anderson | 31 July 2005, 08:17:25 UTC | [PATCH] Add new dependencies caused by git-send-email-script to debian/control Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:15 UTC |
| 479cec9 | Ryan Anderson | 31 July 2005, 08:17:25 UTC | [PATCH] Add documentation for git-send-email-script Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:13 UTC |
| 83b2443 | Ryan Anderson | 31 July 2005, 08:17:25 UTC | [PATCH] Add git-send-email-script - tool to send emails from git-format-patch-script This is based off of GregKH's script, send-lots-of-email.pl, and strives to do all the nice things a good subsystem maintainer does when forwarding a patch or 50 upstream: All the prior handlers of the patch, as determined by the Signed-off-by: lines, and/or the author of the commit, are cc:ed on the email. All emails are sent as a reply to the previous email, making it easy to skip a collection of emails that are uninteresting. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:12 UTC |
| 70b9829 | barkalow@iabervon.org | 02 August 2005, 23:46:29 UTC | [PATCH] Parallelize pulling by ssh This causes ssh-pull to request objects in prefetch() and read then in fetch(), such that it reduces the unpipelined round-trip time. This also makes sha1_write_from_fd() support having a buffer of data which it accidentally read from the fd after the object; this was formerly not a problem, because it would always get a short read at the end of an object, because the next object had not been requested. This is no longer true. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 August 2005, 05:53:11 UTC |
