Permalink
Commits on Feb 16, 2006
  1. More useful/hinting error messages in git-checkout

    Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    weidendo committed with Junio C Hamano Feb 15, 2006
  2. Print an error if cloning a http repo and NO_CURL is set

    If Git is compiled with NO_CURL=YesPlease and one tries to
    clone a http repository, git-clone tries to call the curl
    binary. This trivial patch prints an error instead in such
    situation.
    
    Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fernando J. Pereda committed with Junio C Hamano Feb 15, 2006
Commits on Feb 15, 2006
  1. checkout: fix dirty-file display.

    When we refused to switch branches, we incorrectly showed
    differences from the branch we would have switched to.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 15, 2006
Commits on Feb 14, 2006
  1. combine-diff: diff-files fix (#2)

    The raw format "git-diff-files -c" to show unmerged state forgot
    to initialize the status fields from parents, causing NUL
    characters to be emitted.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 14, 2006
  2. combine-diff: diff-files fix.

    When showing a conflicted merge from index stages and working
    tree file, we did not fetch the mode from the working tree,
    and mistook that as a deleted file.  Also if the manual
    resolution (or automated resolution by git rerere) ended up
    taking either parent's version, we did not show _anything_ for
    that path.  Either was quite bad and confusing.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 14, 2006
  3. s/SHELL/SHELL_PATH/ in Makefile

    With the current Makefile we don't use the shell chosen by the
    platform specific defines when we invoke GIT-VERSION-GEN.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen committed with Junio C Hamano Feb 13, 2006
  4. bisect: remove BISECT_NAMES after done.

    I noticed that we forgot to clean this file and kept it that
    way, while trying to help with Andrew's bisect problem.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 14, 2006
  5. Documentation: git-ls-files asciidocco.

    Noticed by Jon Nelson.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 14, 2006
Commits on Feb 13, 2006
  1. Documentation: git-commit in 1.2.X series defaults to --include.

    The documentation was mistakenly describing the --only semantics to
    be default.  The 1.2.0 release and its maintenance series 1.2.X will
    keep the traditional --include semantics as the default.  Clarify the
    situation.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 13, 2006
Commits on Feb 12, 2006
  1. GIT 1.2.0

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 12, 2006
  2. 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 committed Feb 12, 2006
  3. 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 switched to.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 12, 2006
  4. 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>
    Junio C Hamano committed Feb 12, 2006
  5. 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>
    raalkml committed with Junio C Hamano Feb 12, 2006
  6. fix "test: 2: unexpected operator" on bsd

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml committed with Junio C Hamano Feb 12, 2006
  7. 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 inserted an object
    into the hash entries with idx >= count due to overflow. When we then
    rehash the last old entry, that old entry might become empty, which means
    that the overflow entries should be re-hashed again.
    
    In other words, the loop has to be fixed to either traverse the whole
    array, rather than just the old count.
    
    (There's room for a slight optimization: instead of counting all the way
    up, we can break when we see the first empty slot that is above the old
    "count". At that point we know we don't have any collissions that we might
    have to fix up any more. This patch only does the trivial fix)
    
    [jc: with trivial fix on trivial fix]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Feb 12, 2006
  8. 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>
    Junio C Hamano committed Feb 12, 2006
  9. 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>
    dscho committed with Junio C Hamano Feb 12, 2006
  10. 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>
    kent@lysator.liu.se committed with Junio C Hamano Feb 12, 2006
  11. Merge branch 'pb/repo'

    * pb/repo:
      Add support for explicit type specifiers when calling git-repo-config
    Junio C Hamano committed Feb 12, 2006
  12. Merge branch 'jc/fixdiff'

    * jc/fixdiff:
      diff-tree: do not default to -c
    Junio C Hamano committed Feb 12, 2006
  13. 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 before "git-repo-config --get" was
    introduced.  Use the latter tool designed exactly for this
    purpose.
    
    "git-sh-setup" used "git-var GIT_AUTHOR_IDENT" without actually
    wanting to use its value.  The only purpose was to cause the
    command to check and barf if the repository format version
    recorded in the $GIT_DIR/config file is too new for us to deal
    with correctly.  Instead, use "repo-config --get" on a random
    property and see if it die()s, and check if the exit status is
    128 (comes from die -- missing variable is reported with exit
    status 1, so we can tell that case apart).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 11, 2006
  14. 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, the behaviour stays
    unchanged and the raw value is emitted.
    
    This also incidentally fixes the segfault when option with no value is
    encountered.
    
    [jc: tweaked the option parsing a bit to make it easier to see
     that the patch does not change anything but the type stuff in
     the diff output.  Also changed to avoid "foo ? : bar" construct. ]
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Feb 12, 2006
  15. 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
      ca18205
      :100644 100644 538d21d... 59042d1... M	Makefile
      :100644 100644 410b758... 6c47c3a... M	entry.c
      ca18205
      :100644 100644 30479b4... 59042d1... M	Makefile
    
        The same "independent sets of diff" as before without -c.
    
      $ git-diff-tree -r -m -c --abbrev ca18
      ca18205
      ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM	Makefile
    
        Combined.
    
      $ git-diff-tree -r -c --abbrev ca18
      ca18205
      ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM	Makefile
    
        Asking for combined without -m does not make sense, so -c
        implies -m.
    
    We need to supply -c as default to whatchanged, which is a
    one-liner.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Feb 12, 2006
  16. 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 committed Feb 12, 2006
  17. 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>
    Junio C Hamano committed Feb 12, 2006
  18. 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>
    Christian Biesinger committed with Junio C Hamano Feb 11, 2006
  19. 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>
    Junio C Hamano committed Feb 12, 2006
  20. 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 elsewhere too.
    
    Also, since receive_keep_pack() doesn't control the caller, it can't know
    that no signal handlers exist.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Feb 11, 2006
  21. 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 committed with Junio C Hamano Feb 11, 2006
Commits on Feb 11, 2006
  1. 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, and what the
    packing speed is. Which makes the user realize that it's actually doing
    something useful instead of sitting there silently (and if the recipient
    knows how large the final result is, he can at least make a guess about
    when it migt be done).
    
    So with this patch, I get something like this on my DSL line:
    
    	[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
    	Packing 188543 objects
    	  48.398MB  (154 kB/s)
    
    where even the speed approximation seems to be roughtly correct (even
    though my algorithm is a truly stupid one, and only really gives "speed in
    the last half second or so").
    
    Anyway, _something_ like this is definitely needed. It could certainly be
    better (if it showed the same kind of thing that git-unpack-objects did,
    that would be much nicer, but would require parsing the object stream as
    it comes in). But this is  big step forward, I think.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Feb 11, 2006
  2. 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 committed Feb 11, 2006
  3. 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 committed Feb 11, 2006
  4. 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 committed Feb 11, 2006
Commits on Feb 10, 2006
  1. 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 affected by this flag.
    Junio C Hamano committed Feb 10, 2006