Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.2.0 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix "test: unexpected operator" on bsd This fixes the same issue as a previous fix by Alex Riesen does. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-commit: show dirtiness including index. Earlier, when we switched a branch we used diff-files to show paths that are dirty in the working tree. But we allow switching branches with updated index ("read-tree -m -u $old $new" works that way), and only showing paths that have differences in the working tree but not paths that are different in index was confusing. This shows both as modified from the top commit of the branch we just have …
Junio C Hamano
Make pack-objects chattier. You could give -q to squelch it, but currently no tool does it. This would make 'git clone host:repo here' over ssh not silent again. Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen
avoid echo -e, there are systems where it does not work FreeBSD 4.11 being one example: the built-in echo doesn't have -e, and the installed /bin/echo does not do "-e" as well. "printf" works, laking just "\e" and "\xAB'. Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen
fix "test: 2: unexpected operator" on bsd Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
Fix object re-hashing The hashed object lookup had a subtle bug in re-hashing: it did for (i = 0; i < count; i++) if (objs[i]) { .. rehash .. where "count" was the old hash couny. Oon the face of it is obvious, since it clearly re-hashes all the old objects. However, it's wrong. If the last old hash entry before re-hashing was in use (or became in use by the re-hashing), then when re-hashing could have insert…
Junio C Hamano
hashtable-based objects: minimum fixups. Calling hashtable_index from find_object before objs is created would result in division by zero failure. Avoid it. Also the given object name may not be aligned suitably for unsigned int; avoid dereferencing casted pointer. Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
Use a hashtable for objects instead of a sorted list In a simple test, this brings down the CPU time from 47 sec to 22 sec. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
kent@lysator.liu.se
Add howto about separating topics. This howto consists of a footnote from an email by JC to the git mailing list (<7vfyms0x4p.fsf@assigned-by-dhcp.cox.net>). Signed-off-by: Kent Engstrom <kent@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'pb/repo' * pb/repo: Add support for explicit type specifiers when calling git-repo-config
Junio C Hamano
Merge branch 'jc/fixdiff' * jc/fixdiff: diff-tree: do not default to -c
Junio C Hamano
Avoid using "git-var -l" until it gets fixed. This is to be nicer to people with unusable GECOS field. "git-var -l" is currently broken in that when used by a user who does not have a usable GECOS field and has not corrected it by exporting GIT_COMMITTER_NAME environment variable it dies when it tries to output GIT_COMMITTER_IDENT (same thing for AUTHOR). "git-pull" used "git-var -l" only because it needed to get a configuration variable be…
Petr Baudis
Add support for explicit type specifiers when calling git-repo-config Currently, git-repo-config will just return the raw value of option as specified in the config file; this makes things difficult for scripts calling it, especially if the value is supposed to be boolean. This patch makes it possible to ask git-repo-config to check if the option is of the given type (int or bool) and write out the value in its canonical form. If you do not pass --int or --bool, th…
Junio C Hamano
diff-tree: do not default to -c Marco says it breaks qgit. This makes the flags a bit more orthogonal. $ git-diff-tree -r --abbrev ca18 No output from this command because you asked to skip merge by not having -m there. $ git-diff-tree -r -m --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 538d21d... 59042d1... M Makefile :100644 100644 410b758... 6c47c3a... M entry.c ca182053c7710a28…
Junio C Hamano
t5500: adjust to change in pack-object reporting behaviour. Now pack-object is not as chatty when its stderr is not connected to a terminal, so the test needs to be adjusted for that. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Only call git-rerere if $GIT_DIR/rr-cache exists. Johannes noticed that git-rerere depends on Digest.pm, and if one does not use the command, one can live without it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Biesinger
Use a relative path for SVN importing The absolute path (with the leading slash) breaks SVN importing, because it then looks for /trunk/... instead of /svn/trunk/... (in my case, the repository URL was https://servername/svn/) Signed-off-by: Christian Biesinger <cbiesinger@web.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
fetch-clone progress: finishing touches. This makes fetch-pack also report the progress of packing part. Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
Fix fetch-clone in the presense of signals We shouldn't fail a fetch just because a signal might have interrupted the read. Normally, we don't install any signal handlers, so EINTR really shouldn't happen. That said, really old versions of Linux will interrupt an interruptible system call even for signals that turn out to be ignored (SIGWINCH is the classic example - resizing your xterm would cause it). The same might well be true elsewhe…
Linus Torvalds
Make "git clone" pack-fetching download statistics better Average it out over a few events to make the numbers stable, and fix the silly usec->binary-ms conversion. Yeah, yeah, it's arguably eye-candy to keep the user calm, but let's do that right. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
Make "git clone" less of a deathly quiet experience It used to be that "git-unpack-objects" would give nice percentages, but now that we don't unpack the initial clone pack any more, it doesn't. And I'd love to do that nice percentage view in the pack objects downloader too, but the thing doesn't even read the pack header, much less know how much it's going to get, so I was lazy and didn't. Instead, it at least prints out how much data it's gotten…
Junio C Hamano
Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values. Without these, running tests with an account with empty gecos field would fail. We might want to loosen error from "git-var -l" (but not "git-var GIT_AUTHOR_NAME") later, but that is more or less an independent issue. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'lt/diff-tree' * lt/diff-tree: combine-diff: Record diff status a bit more faithfully find_unique_abbrev() simplification. combine-diff: move formatting logic to show_combined_diff() combined-diff: use diffcore before intersecting paths. diff-tree -c raw output
Junio C Hamano
git-commit -v: have patch at the end. It was pointed out that otherwise more important summary information prefixed with '#' would become prone to be missed. Also instead of chopping at the first '^---$' line, stop at the first 'diff --git a/' line. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
rev-list: default to abbreviate merge parent names under --pretty. When we prettyprint commit log messages, merge parent names were often very long and there was no way to abbreviate it. This changes them to be abbreviated by default, and non-default abbreviations can be specified with --no-abbrev or --abbrev=<n> options. Note that this affects only the prettyprinted parent names. The output from --show-parents is meant for machine consumption and is not affec…
Nicolas Pitre
delta micro optimization My kernel work habit made me look at the generated assembly for the delta code, and one obvious albeit small improvement is this patch. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre
count-delta.c: comment fixes There was a stale comment that explains why the old code could undercount when delta data copied things around inside detination buffer. We do not use that kind of delta, so the comment does not apply.
Junio C Hamano
Merge branch 'jc/empty-commit' * jc/empty-commit: t6000: fix a careless test library add-on. Do not allow empty name or email.
Junio C Hamano
combine-diff: Record diff status a bit more faithfully This shows "new file mode XXXX" and "deleted file mode XXXX" lines like two-way diff-patch output does, by checking the status from each parent. The diff-raw output for combined diff is made a bit uglier by showing diff status letters with each parent. While most of the case you would see "MM" in the output, an Evil Merge that touches a path that was added by inheriting from one parent is possib…
  1. Prev
  2. Next