| dff86e2 | Junio C Hamano | 28 March 2006, 00:08:29 UTC | GIT 1.3.0 rc1 All of the things that were not in the "master" branch were either cooked long enough in "next" without causing problems (e.g. insanely fast rename detector or true built-in diff) or isolated in a specific subsystem (e.g. tar-tree and svnimport). So I am clearing the deck to prepare for a 1.3.0. Remaining wrinkles, if any, will be ironed in the "master" branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 March 2006, 00:08:29 UTC |
| 65b5e41 | Junio C Hamano | 28 March 2006, 00:03:36 UTC | Merge branch ak/svn | 28 March 2006, 00:03:36 UTC |
| ac93bfc | Junio C Hamano | 27 March 2006, 07:44:28 UTC | Merge branch 'lt/diffgen' into next * lt/diffgen: add clean and ignore rules for xdiff/ Remove dependency on a file named "-lz" | 27 March 2006, 07:44:28 UTC |
| d93067d | Junio C Hamano | 27 March 2006, 07:44:14 UTC | Merge branch 'master' into next * master: Optionally do not list empty directories in git-ls-files --others Document git-rebase behavior on conflicts. Fix error handling for nonexistent names | 27 March 2006, 07:44:14 UTC |
| 3467fec | Junio C Hamano | 27 March 2006, 07:41:22 UTC | add clean and ignore rules for xdiff/ Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 March 2006, 07:41:22 UTC |
| b0a3de4 | Petr Baudis | 26 March 2006, 14:59:52 UTC | Optionally do not list empty directories in git-ls-files --others Without the --directory flag, git-ls-files wouldn't ever list directories, producing no output for empty directories, which is good since they cannot be added and they bear no content, even untracked one (if Git ever starts tracking directories on their own, this should obviously change since the content notion will change). With the --directory flag however, git-ls-files would list even empty directories. This may be good in some situations but sometimes you want to prevent that. This patch adds a --no-empty-directory option which makes git-ls-files omit empty directories. Signed-off-by: Petr Baudis <pasky@suse.cz> | 27 March 2006, 03:08:24 UTC |
| 8978d04 | J. Bruce Fields | 26 March 2006, 20:29:28 UTC | Document git-rebase behavior on conflicts. | 27 March 2006, 03:07:43 UTC |
| 54c261f | Johannes Schindelin | 26 March 2006, 23:14:52 UTC | Remove dependency on a file named "-lz" By changing the dependency "$(LIB_H)" to "$(LIBS)", at least one version of make thought that a file named "-lz" would be needed. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 March 2006, 03:07:08 UTC |
| fb18a2e | Linus Torvalds | 27 March 2006, 00:28:20 UTC | Fix error handling for nonexistent names When passing in a pathname pattern without the "--" separator on the command line, we verify that the pathnames in question exist. However, there were two bugs in that verification: - git-rev-parse would only check the first pathname, and silently allow any invalid subsequent pathname, whether it existed or not (which defeats the purpose of the check, and is also inconsistent with what git-rev-list actually does) - git-rev-list (and "git log" etc) would check each filename, but if the check failed, it would print the error using the first one, i.e.: [torvalds@g5 git]$ git log Makefile bad-file fatal: 'Makefile': No such file or directory instead of saying that it's 'bad-file' that doesn't exist. This fixes both bugs. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 March 2006, 03:06:17 UTC |
| f4e96f9 | Junio C Hamano | 26 March 2006, 08:24:03 UTC | Merge branch 'jc/thin' into next * jc/thin: git-push: make --thin pack transfer the default. gitk: Fix two bugs reported by users gitk: Improve appearance of first child links gitk: Make downward-pointing arrows end in vertical line segment gitk: Don't change cursor at end of layout if find in progress gitk: Make commitdata an array rather than a list gitk: Fix display of diff lines beginning with --- or +++ [PATCH] gitk: Make error_popup react to Return gitk: Fix a bug in drawing the selected line as a thick line gitk: Further speedups gitk: Various speed improvements gitk: Fix Update menu item gitk: Fix clicks on arrows on line ends gitk: New improved gitk contrib/git-svn: stabilize memory usage for big fetches | 26 March 2006, 08:24:03 UTC |
| 84f11a4 | Junio C Hamano | 26 March 2006, 02:27:15 UTC | git-push: make --thin pack transfer the default. Just in case it has problems, you can say "git push --no-thin". Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 08:23:52 UTC |
| be1295d | Junio C Hamano | 26 March 2006, 08:22:53 UTC | Merge branches 'jc/clone' and 'jc/name' * jc/clone: git-clone: typofix. clone: record the remote primary branch with remotes/$origin/HEAD revamp git-clone (take #2). revamp git-clone. fetch,parse-remote,fmt-merge-msg: refs/remotes/* support * jc/name: sha1_name: make core.warnambiguousrefs the default. sha1_name: warning ambiguous refs. get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists. | 26 March 2006, 08:22:53 UTC |
| 692c7fc | Junio C Hamano | 26 March 2006, 08:22:48 UTC | Merge branch 'jc/merge' * jc/merge: git-merge knows some strategies want to skip trivial merges | 26 March 2006, 08:22:48 UTC |
| b9aa1f9 | Junio C Hamano | 26 March 2006, 08:15:44 UTC | Merge branch 'lt/diffgen' into next * lt/diffgen: true built-in diff: run everything in-core. | 26 March 2006, 08:15:44 UTC |
| a7cfb4a | Anand Kumria | 25 March 2006, 22:43:46 UTC | git-svnimport: if a limit is specified, respect it git-svnimport will import the same revision over and over again if a limit (-l <rev>) has been specified. Instead if that revision has already been processed, exit with an up-to-date message. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 08:15:01 UTC |
| 9086a18 | Junio C Hamano | 26 March 2006, 08:13:25 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix two bugs reported by users gitk: Improve appearance of first child links gitk: Make downward-pointing arrows end in vertical line segment gitk: Don't change cursor at end of layout if find in progress gitk: Make commitdata an array rather than a list gitk: Fix display of diff lines beginning with --- or +++ [PATCH] gitk: Make error_popup react to Return gitk: Fix a bug in drawing the selected line as a thick line gitk: Further speedups gitk: Various speed improvements gitk: Fix Update menu item gitk: Fix clicks on arrows on line ends gitk: New improved gitk | 26 March 2006, 08:13:25 UTC |
| cebff98 | Junio C Hamano | 26 March 2006, 07:12:17 UTC | true built-in diff: run everything in-core. This stops using temporary files when we are using the built-in diff (including the complete rewrite). Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 07:27:01 UTC |
| 0382318 | Eric Wong | 26 March 2006, 02:52:31 UTC | contrib/git-svn: stabilize memory usage for big fetches We should be safely able to import histories with thousands of revisions without hogging up lots of memory. With this, we lose the ability to autocorrect mistakes when people specify revisions in reverse, but it's probably no longer a problem since we only have one method of log parsing nowadays. I've added an extra check to ensure that revision numbers do increment. Also, increment the version number to 0.11.0. I really should just call it 1.0 soon... Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 05:23:54 UTC |
| dad7230 | Junio C Hamano | 26 March 2006, 01:44:09 UTC | Merge branch 'ew/email' into next * ew/email: send-email: lazy-load Email::Valid and make it optional send-email: try to order messages in email clients more correctly send-email: Change from Mail::Sendmail to Net::SMTP send-email: use built-in time() instead of /bin/date '+%s' | 26 March 2006, 01:44:09 UTC |
| 9acf322 | Junio C Hamano | 26 March 2006, 01:44:01 UTC | Merge branch 'lt/diffgen' into next * lt/diffgen: built-in diff: minimum tweaks builtin-diff: \No newline at end of file. Use a *real* built-in diff generator | 26 March 2006, 01:44:01 UTC |
| 48d6e97 | Junio C Hamano | 26 March 2006, 01:43:22 UTC | Merge branch 'rs/tar-tree' into next * rs/tar-tree: tar-tree: Use the prefix field of a tar header tar-tree: Remove obsolete code tar-tree: Use write_entry() to write the archive contents tar-tree: Introduce write_entry() tar-tree: Use SHA1 of root tree for the basedir git-apply: safety fixes Removed bogus "<snap>" identifier. Clarify and expand some hook documentation. commit-tree: check return value from write_sha1_file() send-email: Identify author at the top when sending e-mail Format tweaks for asciidoc. | 26 March 2006, 01:43:22 UTC |
| 567ffeb | Eric Wong | 26 March 2006, 00:47:12 UTC | send-email: lazy-load Email::Valid and make it optional It's not installed on enough machines, and is overkill most of the time. We'll fallback to a very basic regexp just in case, but nothing like the monster regexp Email::Valid has to offer :) Small cleanup from Merlyn. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 01:41:23 UTC |
| a5370b1 | Eric Wong | 25 March 2006, 11:01:01 UTC | send-email: try to order messages in email clients more correctly If --no-chain-reply-to is set, patches may not always be ordered correctly in email clients. This patch makes sure each email sent from a different second. I chose to start with a time (slightly) in the past because those are probably more likely in real-world usage and spam filters might be more tolerant of them. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 01:41:22 UTC |
| 4bc87a2 | Eric Wong | 26 March 2006, 01:20:48 UTC | send-email: Change from Mail::Sendmail to Net::SMTP Net::SMTP is in the base Perl distribution, so users are more likely to have it. Net::SMTP also allows reusing the SMTP connection, so sending multiple emails is faster. [jc: tweaked X-Mailer further while we are at it.] Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 01:41:06 UTC |
| 72095d5 | Eric Wong | 25 March 2006, 10:43:31 UTC | send-email: use built-in time() instead of /bin/date '+%s' Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:50:57 UTC |
| 3ce8f08 | Junio C Hamano | 25 March 2006, 20:16:17 UTC | built-in diff: minimum tweaks This fixes up a couple of minor issues with the real built-in diff to be more usable: - Omit ---/+++ header unless we emit diff output; - Detect and punt binary diff like GNU does; - Honor GIT_DIFF_OPTS minimally (only -u<number> and --unified=<number> are currently supported); - Omit line count of 1 from "@@ -l,k +m,n @@" hunk header (i.e. when k == 1 or n == 1) - Adjust testsuite for the lack of -p support. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:50:00 UTC |
| 621c53c | Linus Torvalds | 25 March 2006, 15:56:03 UTC | builtin-diff: \No newline at end of file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:49:59 UTC |
| 3443546 | Linus Torvalds | 25 March 2006, 04:13:22 UTC | Use a *real* built-in diff generator This uses a simplified libxdiff setup to generate unified diffs _without_ doing fork/execve of GNU "diff". This has several huge advantages, for example: Before: [torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null real 0m24.818s user 0m13.332s sys 0m8.664s After: [torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null real 0m4.563s user 0m2.944s sys 0m1.580s and the fact that this should be a lot more portable (ie we can ignore all the issues with doing fork/execve under Windows). Perhaps even more importantly, this allows us to do diffs without actually ever writing out the git file contents to a temporary file (and without any of the shell quoting issues on filenames etc etc). NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the current "diff-core" code actually will always write the temp-files, because it used to be something that you simply had to do. So this current one actually writes a temp-file like before, and then reads it into memory again just to do the diff. Stupid. But if this basic infrastructure is accepted, we can start switching over diff-core to not write temp-files, which should speed things up even further, especially when doing big tree-to-tree diffs. Now, in the interest of full disclosure, I should also point out a few downsides: - the libxdiff algorithm is different, and I bet GNU diff has gotten a lot more testing. And the thing is, generating a diff is not an exact science - you can get two different diffs (and you will), and they can both be perfectly valid. So it's not possible to "validate" the libxdiff output by just comparing it against GNU diff. - GNU diff does some nice eye-candy, like trying to figure out what the last function was, and adding that information to the "@@ .." line. libxdiff doesn't do that. - The libxdiff thing has some known deficiencies. In particular, it gets the "\No newline at end of file" case wrong. So this is currently for the experimental branch only. I hope Davide will help fix it. That said, I think the huge performance advantage, and the fact that it integrates better is definitely worth it. But it should go into a development branch at least due to the missing newline issue. Technical note: this is based on libxdiff-0.17, but I did some surgery to get rid of the extraneous fat - stuff that git doesn't need, and seriously cutting down on mmfile_t, which had much more capabilities than the diff algorithm either needed or used. In this version, "mmfile_t" is just a trivial <pointer,length> tuple. That said, I tried to keep the differences to simple removals, so that you can do a diff between this and the libxdiff origin, and you'll basically see just things getting deleted. Even the mmfile_t simplifications are left in a state where the diffs should be readable. Apologies to Davide, whom I'd love to get feedback on this all from (I wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old complex format had a helper function for that, but I did my surgery with the goal in mind that eventually we _should_ just do mmfile_t mf; buf = read_sha1_file(sha1, type, &size); mf->ptr = buf; mf->size = size; .. use "mf" directly .. which was really a nightmare with the old "helpful" mmfile_t, and really is that easy with the new cut-down interfaces). [ Btw, as any hawk-eye can see from the diff, this was actually generated with itself, so it is "self-hosting". That's about all the testing it has gotten, along with the above kernel diff, which eye-balls correctly, but shows the newline issue when you double-check it with "git-apply" ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:49:58 UTC |
| 4c69172 | Rene Scharfe | 25 March 2006, 22:21:07 UTC | tar-tree: Use the prefix field of a tar header ... to store parts of the path, if possible. This allows us to avoid writing extended headers in certain cases (long pathes can only be split at '/' chars). Also adds a file to the test repo with a 100 chars long directory name. Even old versions of tar that don't understand POSIX extended headers should be able to handle this testcase. Btw.: The longest path in the kernel tree currently has 70 chars. Together with a 30 chars long prefix this would already cross the field limit of 100 chars. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:40:34 UTC |
| 86da1c5 | Rene Scharfe | 25 March 2006, 22:21:05 UTC | tar-tree: Remove obsolete code Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:37:08 UTC |
| cb0c6df | Rene Scharfe | 25 March 2006, 22:21:04 UTC | tar-tree: Use write_entry() to write the archive contents Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:36:54 UTC |
| ae64bbc | Rene Scharfe | 25 March 2006, 22:21:03 UTC | tar-tree: Introduce write_entry() ... and use it initially to write global extended header records. Improvements compared to the old write_header(): - Uses a struct ustar_header instead of hardcoded offsets. - Takes one struct strbuf as path argument instead of a (basedir, prefix, name) tuple. - Not only writes the tar header, but also the contents of the file, if any. - Does not write directly into the ring buffer. This allows the code to be layed out more naturally, because there is no more ordering constraint. Before we had to first finish writing the extended header, now we can construct the extended and normal headers in parallel. - The typeflag parameter has been replaced by (reasonable) magic values. path == NULL indicates an extended header, additionally sha1 == NULL means it is a global extended header. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:35:43 UTC |
| 2c6df2d | Rene Scharfe | 25 March 2006, 22:21:02 UTC | tar-tree: Use SHA1 of root tree for the basedir ... instead of the made-up "0". Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:34:37 UTC |
| c150462 | Linus Torvalds | 25 March 2006, 21:28:28 UTC | git-apply: safety fixes This was triggered by me testing the "@@" numbering shorthand by GNU patch, which not only showed that git-apply thought it meant the number was duplicated (when it means that the second number is 1), but my tests showed than when git-apply mis-understood the number, it would then not raise an alarm about it if the patch ended early. Now, this doesn't actually _matter_, since with a three-line context, the only case that "x,1" will be shorthanded to "x" is when x itself is 1 (in which case git-apply got it right), but the fact that git-apply would also silently accept truncated patches was a missed opportunity for additional sanity-checking. So make git-apply refuse to look at a patch fragment that ends early. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 March 2006, 00:34:05 UTC |
| 6a1640f | Jon Loeliger | 25 March 2006, 03:27:13 UTC | Removed bogus "<snap>" identifier. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2006, 06:24:06 UTC |
| 6250ad1 | Jon Loeliger | 25 March 2006, 03:21:07 UTC | Clarify and expand some hook documentation. Clarify update and post-update hooks. Made a few references to the hooks documentation. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2006, 06:24:02 UTC |
| 7561d9f | Junio C Hamano | 25 March 2006, 06:23:25 UTC | commit-tree: check return value from write_sha1_file() ... found by Matthias Kestenholz. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 March 2006, 06:23:25 UTC |
| 88d9405 | Junio C Hamano | 24 March 2006, 07:52:42 UTC | Merge branch 'jc/name' into next * jc/name: sha1_name: make core.warnambiguousrefs the default. sha1_name: warning ambiguous refs. | 24 March 2006, 07:52:42 UTC |
| 79f558a | Junio C Hamano | 24 March 2006, 07:49:07 UTC | Merge branch 'jc/cvsimport' * jc/cvsimport: cvsimport: fix reading from rev-parse cvsimport: honor -i and non -i upon subsequent imports | 24 March 2006, 07:49:07 UTC |
| bdaa085 | Junio C Hamano | 24 March 2006, 07:47:32 UTC | Merge branch 'jc/pull' * jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch. | 24 March 2006, 07:47:32 UTC |
| 9bc8b77 | Junio C Hamano | 24 March 2006, 07:46:06 UTC | Merge branch 'jc/fetch' * jc/fetch: fetch: exit non-zero when fast-forward check fails. | 24 March 2006, 07:46:06 UTC |
| 8a8e623 | Junio C Hamano | 24 March 2006, 07:43:52 UTC | send-email: Identify author at the top when sending e-mail git-send-email did not check if the sender is the same as the patch author. Follow the "From: at the beginning" convention to propagate the patch author correctly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 March 2006, 07:43:52 UTC |
| 1b371f5 | Junio C Hamano | 24 March 2006, 07:42:40 UTC | sha1_name: make core.warnambiguousrefs the default. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 March 2006, 07:42:40 UTC |
| 84a9b58 | Junio C Hamano | 24 March 2006, 07:41:18 UTC | sha1_name: warning ambiguous refs. This makes sure that many commands that take refs on the command line to honor core.warnambiguousrefs configuration. Earlier, the commands affected by this patch did not read the configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 March 2006, 07:41:18 UTC |
| b0d08a5 | Francis Daly | 22 March 2006, 09:53:57 UTC | Format tweaks for asciidoc. Some documentation "options" were followed by independent preformatted paragraphs. Now they are associated plain text paragraphs. The difference is clear in the generated html. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2006, 19:06:19 UTC |
| dcd0409 | Junio C Hamano | 22 March 2006, 09:57:24 UTC | Merge branch 'jc/pull' into next * jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch. | 22 March 2006, 09:57:24 UTC |
| 8323124 | Junio C Hamano | 22 March 2006, 09:57:11 UTC | git-pull: reword "impossible to fast-forward" message. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2006, 09:57:11 UTC |
| cf46e7b | Junio C Hamano | 22 March 2006, 09:09:43 UTC | git-pull: further safety while on tracking branch. Running 'git pull' while on the tracking branch has a built-in safety valve to fast-forward the index and working tree to match the branch head, but it errs on the safe side too cautiously. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2006, 09:09:43 UTC |
| 8ff8eea | Junio C Hamano | 22 March 2006, 08:52:41 UTC | Merge branch 'jc/revlist' into next * jc/revlist: rev-list --timestamp git-apply: do not barf when updating an originally empty file. http-push.c: squelch C90 warnings. fix field width/precision warnings in blame.c | 22 March 2006, 08:52:41 UTC |
| ac5a851 | Junio C Hamano | 22 March 2006, 08:52:36 UTC | Merge branch 'jc/clone' into next * jc/clone: git-clone: typofix. | 22 March 2006, 08:52:36 UTC |
| 4c2e98d | Junio C Hamano | 22 March 2006, 08:23:16 UTC | git-clone: typofix. The traditional one created refs/origin by mistake, not refs/heads/origin. Also it mistakenly failed to prevent $origin from being listed twice in remotes/origin file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2006, 08:50:32 UTC |
| dc68c4f | Junio C Hamano | 22 March 2006, 08:22:00 UTC | rev-list --timestamp This prefixes the raw commit timestamp to the output. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2006, 08:22:00 UTC |
| 3103cf9 | Junio C Hamano | 22 March 2006, 08:21:07 UTC | git-apply: do not barf when updating an originally empty file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 March 2006, 08:21:07 UTC |
| 8c9e794 | Junio C Hamano | 21 March 2006, 23:49:05 UTC | http-push.c: squelch C90 warnings. If you write code after declarations in a block, gcc scolds you with "warning: ISO C90 forbids mixed declarations and code". Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 23:50:18 UTC |
| 2928390 | Luck, Tony | 21 March 2006, 23:28:06 UTC | fix field width/precision warnings in blame.c Using "size_t" values for printf field width/precision upsets gcc, it wants to see an "int". Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 23:39:44 UTC |
| 7a1d9d1 | Paul Mackerras | 21 March 2006, 23:21:45 UTC | gitk: Fix two bugs reported by users The first was a simple typo where I put $yc instead of [yc $row]. The second was that I broke the logic for keeping up with fast movement through the commits, e.g. when you select a commit and then press down-arrow and let it autorepeat. That got broken when I changed the merge diff display to use git-diff-tree --cc. Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 March 2006, 23:21:45 UTC |
| d293b28 | Junio C Hamano | 21 March 2006, 10:04:50 UTC | Merge branch 'jc/clone' into next * jc/clone: clone: record the remote primary branch with remotes/$origin/HEAD | 21 March 2006, 10:04:50 UTC |
| 5a6696a | Junio C Hamano | 21 March 2006, 10:04:46 UTC | Merge branch 'jc/name' into next * jc/name: get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD | 21 March 2006, 10:04:46 UTC |
| 5ceb05f | Junio C Hamano | 21 March 2006, 09:58:26 UTC | clone: record the remote primary branch with remotes/$origin/HEAD This matches c51d13692d4e451c755dd7da3521c5db395df192 commit to record the primary branch of the remote with a symbolic ref remotes/$origin/HEAD. The user can later change it to point at different branch to change the meaning of "$origin" shorthand. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 10:02:46 UTC |
| c51d136 | Junio C Hamano | 21 March 2006, 09:42:04 UTC | get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD This implements the suggestion by Jeff King to use refs/remotes/$foo/HEAD to interpret a shorthand "$foo" to mean the primary branch head of a tracked remote. clone needs to be told about this convention as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 09:42:04 UTC |
| f1250ed | Junio C Hamano | 21 March 2006, 08:15:21 UTC | Merge branch 'jc/name' into next * jc/name: core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists. contrib/git-svn: allow rebuild to work on non-linear remote heads http-push: don't assume char is signed http-push: add support for deleting remote branches Be verbose when !initial commit Fix multi-paragraph list items in OPTIONS section http-fetch: nicer warning for a server with unreliable 404 status | 21 March 2006, 08:15:21 UTC |
| 83c1379 | Junio C Hamano | 21 March 2006, 08:15:15 UTC | Merge branch 'jc/clone' into next * jc/clone: revamp git-clone (take #2). | 21 March 2006, 08:15:15 UTC |
| 47874d6 | Junio C Hamano | 21 March 2006, 08:14:13 UTC | revamp git-clone (take #2). This builds on top of the previous one. * --use-separate-remote uses .git/refs/remotes/$origin/ directory to keep track of the upstream branches. * The $origin above defaults to "origin" as usual, but the existing "-o $origin" option can be used to override it. I am not yet convinced if we should make "$origin" the synonym to "refs/remotes/$origin/$name" where $name is the primary branch name of $origin upstream, nor if so how we should decide which upstream branch is the primary one, but that is more or less orthogonal to what the clone does here. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 08:14:13 UTC |
| 2f8acdb | Junio C Hamano | 21 March 2006, 02:45:47 UTC | core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 07:34:17 UTC |
| ac74905 | Eric Wong | 21 March 2006, 04:51:16 UTC | contrib/git-svn: allow rebuild to work on non-linear remote heads Because committing back to an SVN repository from different machines can result in different lineages, two different repositories running git-svn can result in different commit SHA1s (but of the same tree). Sometimes trees that are tracked independently are merged together (usually via children), resulting in non-unique git-svn-id: lines in rev-list. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 March 2006, 07:31:19 UTC |
| a3c57c9 | Nick Hengeveld | 20 March 2006, 19:50:51 UTC | http-push: don't assume char is signed Declare remote_dir_exists[] as signed char to be sure that values of -1 are valid. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 22:38:58 UTC |
| 3dfaf7b | Nick Hengeveld | 20 March 2006, 18:31:06 UTC | http-push: add support for deleting remote branches Processes new command-line arguments -d and -D to remove a remote branch if the following conditions are met: - one branch name is present on the command line - the specified branch name matches exactly one remote branch name - the remote HEAD is a symref - the specified branch is not the remote HEAD - the remote HEAD resolves to an object that exists locally (-d only) - the specified branch resolves to an object that exists locally (-d only) - the specified branch is an ancestor of the remote HEAD (-d only) Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 22:38:47 UTC |
| 1fa7a68 | Yasushi SHOJI | 20 March 2006, 13:11:12 UTC | Be verbose when !initial commit verbose option in git-commit.sh lead us to run git-diff-index, which needs a commit-ish we are making diff against. When we are commiting the fist set, we obviously don't have any commit-ish in the repo. So we just skip the git-diff-index run. It might be possible to produce diff against empty but do we need that? Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 22:37:59 UTC |
| 3070b60 | Francis Daly | 20 March 2006, 10:41:18 UTC | Fix multi-paragraph list items in OPTIONS section This patch makes the html docs right, makes the asciidoc docs a bit odd but consistent with what is there already, and makes the manpages look OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69. For the manpages, current is like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT With this patch, docbook-xsl v1.68 looks like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT author and while docbook-xsl v1.69 becomes -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT author and The extra indentation is to keep the v1.69 manpage looking sane. | 20 March 2006, 22:37:33 UTC |
| bb52807 | Junio C Hamano | 20 March 2006, 22:07:59 UTC | http-fetch: nicer warning for a server with unreliable 404 status When a repository otherwise properly prepared is served by a dumb HTTP server that sends "No such page" output with 200 status for human consumption to a request for a page that does not exist, the users will get an alarming "File X corrupt" error message. Hint that they might be dealing with such a server at the end and suggest running fsck-objects to check if the result is OK (the pack-fallback code does the right thing in this case so unless a loose object file was actually corrupt the result should check OK). Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 22:07:59 UTC |
| e2fc650 | Junio C Hamano | 20 March 2006, 08:51:07 UTC | Merge branch 'jc/merge' into next * jc/merge: git-merge knows some strategies want to skip trivial merges generate-cmdlist: style cleanups. Add missing semicolon to sed command. unpack_delta_entry(): reduce memory footprint. git.el: Added a function to diff against the other heads in a merge. git.el: Get the default user name and email from the repository config. git.el: More robust handling of subprocess errors when returning strings. | 20 March 2006, 08:51:07 UTC |
| 1656313 | Junio C Hamano | 20 March 2006, 08:50:58 UTC | Merge branch 'jc/clone' into next * jc/clone: revamp git-clone. | 20 March 2006, 08:50:58 UTC |
| 6ea2334 | Junio C Hamano | 18 March 2006, 22:50:53 UTC | git-merge knows some strategies want to skip trivial merges Most notably "ours". Also this makes sure we do not record duplicated parents on the parent list of the resulting commit. This is based on Mark Wooding's work, but does not change the UI nor introduce new flags. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 08:50:37 UTC |
| dfeff66 | Junio C Hamano | 20 March 2006, 08:21:10 UTC | revamp git-clone. This does two things. * A new flag --reference can be used to name a local repository that is to be used as an alternate. This is in response to an inquiry by James Cloos in the message on the list <m3r74ykue7.fsf@lugabout.cloos.reno.nv.us>. * A new flag --use-separate-remote stops contaminating local branch namespace by upstream branch names. The upstream branch heads are copied in .git/refs/remotes/ instead of .git/refs/heads/ and .git/remotes/origin file is set up to reflect this as well. It requires to have fetch/pull update to understand .git/refs/remotes by Eric Wong to further update the repository cloned this way. For the former change, git-fetch-pack is taught a new flag --all to fetch from all the remote heads. Nobody uses the git-clone-pack with this change, so we could deprecate the command, but removal of the command will be left to a separate round. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 08:21:10 UTC |
| fd662dd | Junio C Hamano | 20 March 2006, 07:54:45 UTC | generate-cmdlist: style cleanups. Instead of giving multiple commands concatenated with semicolon to sed, write them on separate lines. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 07:54:45 UTC |
| ad52e77 | Shawn Pearce | 20 March 2006, 00:18:08 UTC | Add missing semicolon to sed command. generate-cmdlist.sh is giving errors messages from sed on Mac OS 10.4 due to a missing semicolon. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 March 2006, 00:38:24 UTC |
| 67686d9 | Junio C Hamano | 19 March 2006, 21:43:42 UTC | unpack_delta_entry(): reduce memory footprint. Currently we unpack the delta data from the pack and then unpack the base object to apply that delta data to it. When getting an object that is deeply deltified, we can reduce memory footprint by unpacking the base object first and then unpacking the delta data, because we will need to keep at most one delta data in memory that way. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2006, 21:43:42 UTC |
| 2b1c0ef | Alexandre Julliard | 19 March 2006, 09:06:10 UTC | git.el: Added a function to diff against the other heads in a merge. git-diff-file-merge-head generates a diff against the first merge head, or with a prefix argument against the nth head. Bound to `d h' by default. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2006, 20:30:14 UTC |
| 75a8180 | Alexandre Julliard | 19 March 2006, 09:05:48 UTC | git.el: Get the default user name and email from the repository config. If user name or email are not set explicitly, get them from the user.name and user.email configuration values before falling back to the Emacs defaults. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2006, 20:30:07 UTC |
| 9de8316 | Alexandre Julliard | 19 March 2006, 09:05:22 UTC | git.el: More robust handling of subprocess errors when returning strings. Make sure that functions that call a git process and return a string always return nil when the subprocess failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2006, 20:30:01 UTC |
| b7986ce | Junio C Hamano | 18 March 2006, 22:58:20 UTC | Merge branch 'master' into next * master: Makefile: Add TAGS and tags targets ls-files: Don't require exclude files to end with a newline. | 18 March 2006, 22:58:20 UTC |
| f81e7c6 | Fredrik Kuivinen | 18 March 2006, 10:07:12 UTC | Makefile: Add TAGS and tags targets Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 22:01:46 UTC |
| 451d7b4 | Alexandre Julliard | 18 March 2006, 10:27:45 UTC | ls-files: Don't require exclude files to end with a newline. Without this patch, the last line of an exclude file is silently ignored if it doesn't end with a newline. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 22:01:37 UTC |
| eb447a1 | Paul Mackerras | 18 March 2006, 12:11:37 UTC | gitk: Improve appearance of first child links The point where the line for a parent joins to the first child shown is visually different from the lines to the other children, because the line doesn't branch, but terminates at the child. Because of this, we now treat the first child a little differently in the optimizer, and we draw its link in drawlineseg rather than drawparentlinks. This improves the appearance of the graph. Signed-off-by: Paul Mackerras <paulus@samba.org> | 18 March 2006, 12:11:37 UTC |
| 2fc2752 | Junio C Hamano | 18 March 2006, 10:08:10 UTC | Merge branch 'master' into next * master: git-pull: run repo-config with dash form. | 18 March 2006, 10:08:10 UTC |
| f5ef535 | Junio C Hamano | 18 March 2006, 10:07:59 UTC | git-pull: run repo-config with dash form. ... as discussed on the list for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 10:07:59 UTC |
| c534c4b | Junio C Hamano | 18 March 2006, 10:05:22 UTC | Merge branch 'jc/cvsimport' into next * jc/cvsimport: cvsimport: fix reading from rev-parse | 18 March 2006, 10:05:22 UTC |
| cb9594e | Junio C Hamano | 18 March 2006, 10:05:02 UTC | cvsimport: fix reading from rev-parse The updated code reads the tip of the current branch before and after the import runs, but forgot to chomp what we read from the command. The read-tree command did not them with the trailing LF. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 10:05:02 UTC |
| d8d2df0 | Paul Mackerras | 18 March 2006, 09:42:46 UTC | gitk: Make downward-pointing arrows end in vertical line segment It seems Tk 8.4 can't draw arrows on diagonal line segments. This adds code to the optimizer to make the last bit of a line go vertically before being terminated with an arrow pointing downwards, so that it will be drawn correctly by Tk 8.4. Signed-off-by: Paul Mackerras <paulus@samba.org> | 18 March 2006, 09:42:46 UTC |
| 8a414ad | Junio C Hamano | 18 March 2006, 08:43:47 UTC | Merge branch 'jc/empty' * jc/empty: revision traversal: --remove-empty fix (take #2). revision traversal: --remove-empty fix. Conflicts: revision.c (adjust for the updates by Fredrik) | 18 March 2006, 08:43:47 UTC |
| f4171a1 | Paul Mackerras | 18 March 2006, 05:02:51 UTC | gitk: Don't change cursor at end of layout if find in progress If the user is doing a find in files or patches, which changed the cursor to a watch, don't change it back to a pointer when we reach the end of laying out the graph. Signed-off-by: Paul Mackerras <paulus@samba.org> | 18 March 2006, 05:02:51 UTC |
| c816a6b | Junio C Hamano | 18 March 2006, 04:43:15 UTC | Merge branch 'master' into next * master: 3% tighter packs for free Rewrite synopsis to clarify the two primary uses of git-checkout. Fix minor typo. Reference git-commit-tree for env vars. Clarify git-rebase example commands. Document the default source of template files. Call out the two different uses of git-branch and fix a typo. Add git-show reference | 18 March 2006, 04:43:15 UTC |
| 5a1fb2c | Nicolas Pitre | 18 March 2006, 03:45:07 UTC | 3% tighter packs for free This patch makes for 3.4% smaller pack with the git repository, and a bit more than 3% smaller pack with the kernel repository. And so with _no_ measurable CPU difference. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:39 UTC |
| 71bb103 | Jon Loeliger | 18 March 2006, 00:26:01 UTC | Rewrite synopsis to clarify the two primary uses of git-checkout. Fix a few typo/grammar problems. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:38 UTC |
| beb8e13 | Jon Loeliger | 18 March 2006, 00:25:46 UTC | Fix minor typo. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:36 UTC |
| 5bfc4f2 | Jon Loeliger | 18 March 2006, 00:25:09 UTC | Reference git-commit-tree for env vars. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:35 UTC |
| 228382a | Jon Loeliger | 18 March 2006, 00:25:30 UTC | Clarify git-rebase example commands. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:33 UTC |
| 81ea3ce | Jon Loeliger | 18 March 2006, 00:24:49 UTC | Document the default source of template files. Also explain a bit more about how the template option works. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:31 UTC |
| dd18111 | Jon Loeliger | 18 March 2006, 00:24:37 UTC | Call out the two different uses of git-branch and fix a typo. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:30 UTC |
| 55258b5 | Jon Loeliger | 18 March 2006, 00:21:39 UTC | Add git-show reference Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2006, 04:42:28 UTC |
