Permalink
Commits on Apr 18, 2006
  1. GIT 1.3.0

    Junio C Hamano committed Apr 18, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Add git-annotate(1) and git-blame(1)

    jonas committed with Junio C Hamano Mar 6, 2006
    [jc: with entries in git.txt]
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. diff --stat: make sure to set recursive.

    Junio C Hamano committed Apr 18, 2006
    Just like "patch" format always needs recursive, "diffstat"
    format does not make sense without setting recursive.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-svnimport symlink support

    hvr committed with Junio C Hamano Apr 17, 2006
    added svn:special symlink support for access methods other than
    direct-http
    
    Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
    Acked-by: Matthias Urlichs <smurf@smurf.noris.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. packed_object_info_detail(): check for corrupt packfile.

    Junio C Hamano committed Apr 18, 2006
    Serge E. Hallyn noticed that we compute how many input bytes are
    still left, but did not use it for sanity checking.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 17, 2006
  1. cleanups: remove unused variable from exec_cmd.c

    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
    Not sure whether it should be removed, or whether
    execv_git_cmd() should return it rather than -1 at bottom.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. cleanups: prevent leak of two strduped strings in config.c

    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
    Config_filename and lockfile are strduped and then leaked in
    git_config_set_multivar.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. cleanups: Remove impossible case in quote.c

    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
    The switch is inside an if statement which is false if
    the character is ' '.  Either the if should be <=' '
    instead of <' ', or the case should be removed as it could
    be misleading.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. cleanups: Remove unused vars from combine-diff.c

    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
    Mod_type in particular sure looks like it wants to be used, but isn't.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. cleanups: Fix potential bugs in connect.c

    Serge E. Hallyn committed with Junio C Hamano Apr 17, 2006
    The strncmp for ACK was ACK does not include the final space.
    Presumably either we should either remove the trailing space,
    or compare 4 chars (as this patch does).
    
    'path' is sometimes strdup'ed, but never freed.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Merge branch 'jc/boundary'

    Junio C Hamano committed Apr 17, 2006
    * jc/boundary:
      rev-list --boundary: show boundary commits even when limited otherwise.
  7. Merge branch 'jc/bottomless'

    Junio C Hamano committed Apr 17, 2006
    * jc/bottomless:
      rev-list --bisect: limit list before bisecting.
  8. Allow empty lines in info/grafts

    ydirson committed with Junio C Hamano Apr 17, 2006
    In addition to the existing comment support, that just allows the user
    to use a convention that works pretty much everywhere else.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. rev-list --boundary: show boundary commits even when limited otherwise.

    Junio C Hamano committed Apr 17, 2006
    The boundary commits are shown for UI like gitk to draw them as
    soon as topo-order sorting allows, and should not be omitted by
    get_revision() filtering logic.  As long as their immediate
    child commits are shown, we should not filter them out.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Makefile fixups.

    gitzilla committed with Junio C Hamano Apr 17, 2006
    Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Merge git://git.kernel.org/pub/scm/gitk/gitk

    Junio C Hamano committed Apr 17, 2006
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix bug caused by missing commitlisted elements
  12. gitk: Fix bug caused by missing commitlisted elements

    paulusmack committed Apr 17, 2006
    This bug was reported by Yann Dirson, and results in an 'Error:
    expected boolean value but got ""' dialog when scrolling to the bottom
    of the graph under some circumstances.  The issue is that git-rev-list
    isn't outputting all the boundary commits when it is asked for commits
    affecting only certain files.  We already cope with that by adding the
    missing boundary commits in addextraid, but there we weren't adding a
    0 to the end of the commitlisted list when we added the extra id to
    the end of the displayorder list.
    
    This fixes it by appending 0 to commitlisted in addextraid, thus keeping
    commitlisted and displayorder in sync.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
Commits on Apr 16, 2006
  1. reading $GIT_DIR/info/graft - skip comments correctly.

    Junio C Hamano committed Apr 16, 2006
    Noticed by Yann Dirson.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. pager: do not fork a pager if PAGER is set to empty.

    dscho committed with Junio C Hamano Apr 16, 2006
    This skips an extra pipe, and helps debugging tremendously.
    
    [jc: PAGER=cat is a questionable hack and should be done as a separate
    patch. ]
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. diff-options: add --patch-with-stat

    dscho committed with Junio C Hamano Apr 15, 2006
    With this option, git prepends a diffstat in front of the patch.
    
    Since I really, really do not know what a diffstat of a combined diff
    ("merge diff") should look like, the diffstat is not generated for these.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. diff-files --stat: do not dump core with unmerged index.

    Junio C Hamano committed Apr 16, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Support "git cmd --help" syntax

    Linus Torvalds committed with Junio C Hamano Apr 15, 2006
    The "--help" argument is special, in that it is (along with "--version")
    in that is taken by the "git" program itself rather than the sub-command,
    and thus we've had the syntax "git --help cmd".
    
    However, as anybody who has ever used CVS or some similar devil-spawn
    program, it's confusing as h*ll when options before the sub-command act
    differently from options after the sub-command, so this quick hack just
    makes it acceptable to do "git cmd --help" instead, and get the exact same
    result.
    
    It may be hacky, but it's simple and does the trick.
    
    Of course, this does not help if you use one of the non-builtin commands
    without using the "git" helper. Ie you won't be getting a man-page just
    because you do "git-rev-list --help". Don't expect us to be quite _that_
    helpful.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 15, 2006
  1. diff --stat: do not do its own three-dashes.

    Junio C Hamano committed Apr 15, 2006
    I missed that "git-diff-* --stat" spits out three-dash separator
    on its own without being asked.  Remove it.
    
    When we output commit log followed by diff, perhaps --patch-with-stat,
    for downstream consumer, we _would_ want the three-dash between
    the message and the diff material, but that logic belongs to the
    caller, not diff generator.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. diff-tree: typefix.

    Junio C Hamano committed Apr 15, 2006
    Recent diff_tree_setup_paths() update made it take a second
    argument of type "struct diff_options", but we passed another
    struct that happenes to have that type at the beginning by
    mistake.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. GIT v1.3.0-rc4

    Junio C Hamano committed Apr 15, 2006
    I've merged everything I think is ready for 1.3.0, so this is
    the final round -- hopefully I can release this with minimum
    last-minute fixup as v1.3.0 early next week.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'dl/xdiff'

    Junio C Hamano committed Apr 15, 2006
    * dl/xdiff:
      xdiff: post-process hunks to make them consistent.
  5. Merge branch 'js/diffstat'

    Junio C Hamano committed Apr 15, 2006
    * js/diffstat:
      diff --stat: no need to ask funcnames nor context.
      diff-options: add --stat (take 2)
      diff-options: add --stat (take 2)
  6. Merge branch 'jc/fix5500'

    Junio C Hamano committed Apr 15, 2006
    * jc/fix5500:
      t5500: test fix
  7. rev-list --bisect: limit list before bisecting.

    Junio C Hamano committed Apr 14, 2006
    I noticed bisect does not work well without both good and bad.
    Running this script in git.git repository would give you quite
    different results:
    
    	#!/bin/sh
            initial=e83c5163316f89bfbde7d9ab23ca2e25604af290
    
            mid0=`git rev-list --bisect ^$initial --all`
    
            git rev-list $mid0 | wc -l
            git rev-list ^$mid0 --all | wc -l
    
            mid1=`git rev-list --bisect --all`
    
            git rev-list $mid1 | wc -l
            git rev-list ^$mid1 --all | wc -l
    
    The $initial commit is the very first commit you made.  The
    first midpoint bisects things evenly as designed, but the latter
    does not.
    
    The reason I got interested in this was because I was wondering
    if something like the following would help people converting a
    huge repository from foreign SCM, or preparing a repository to
    be fetched over plain dumb HTTP only:
    
            #!/bin/sh
    
            N=4
            P=.git/objects/pack
            bottom=
    
            while test 0 \< $N
            do
                    N=$((N-1))
                    if test -z "$bottom"
                    then
                            newbottom=`git rev-list --bisect --all`
                    else
                            newbottom=`git rev-list --bisect ^$bottom --all`
                    fi
                    if test -z "$bottom"
                    then
                            rev_list="$newbottom"
                    elif test 0 = $N
                    then
                            rev_list="^$bottom --all"
                    else
                            rev_list="^$bottom $newbottom"
                    fi
                    p=$(git rev-list --unpacked --objects $rev_list |
                        git pack-objects $P/pack)
                    git show-index <$P/pack-$p.idx | wc -l
                    bottom=$newbottom
            done
    
    The idea is to pack older half of the history to one pack, then
    older half of the remaining history to another, to continue a
    few times, using finer granularity as we get closer to the tip.
    
    This may not matter, since for a truly huge history, running
    bisect number of times could be quite time consuming, and we
    might be better off running "git rev-list --all" once into a
    temporary file, and manually pick cut-off points from the
    resulting list of commits.  After all we are talking about
    "approximately half" for such an usage, and older history does
    not matter much.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Clean up trailing whitespace when pretty-printing commits

    Linus Torvalds committed with Junio C Hamano Apr 15, 2006
    Partly because we've messed up and now have some commits with trailing
    whitespace, but partly because this also just simplifies the code, let's
    remove trailing whitespace from the end when pretty-printing commits.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 14, 2006
  1. "git cmd -h" for shell scripts.

    Junio C Hamano committed Apr 14, 2006
    Wrappers that use sh-setup took --help but not -h.  Noticed by
    Sébastien Pierre.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-log <diff-options> <paths> documentation

    Junio C Hamano committed Apr 14, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Retire git-log.sh (take #4)

    Junio C Hamano committed Apr 14, 2006
    Noticed by Johannes.  We do not install it anymore, but still have
    been shipping the source, which was crazy.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. stripspace: incomplete line fix (take #2)

    Junio C Hamano committed Apr 14, 2006
    This fixes f4ee3eb breakage, which
    added an extra trailing blank line after stripping trailing blank lines
    by mistake.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. t5500: test fix

    Junio C Hamano committed Apr 14, 2006
    Relying on eye-candy progress bar was fragile to begin with.
    Run fetch-pack with -k option, and count the objects that are in
    the pack that were transferred from the other end.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>