Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 12, 2006
  1. GIT 1.4.4-rc2

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      git-cvsserver: read from git with -z to get non-ASCII pathnames.
  3. git-cvsserver: read from git with -z to get non-ASCII pathnames.

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 11, 2006
  1. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      path-list: fix path-list-insert return value
  2. path-list: fix path-list-insert return value

    Junio C Hamano authored
    When path-list-insert is called on an existing path, it returned an
    unrelated element in the list.  Luckily most of the callers are
    ignoring the return value, but merge-recursive uses it at three places
    and this would have resulted in a bogus rename detection.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 10, 2006
  1. git-annotate: fix -S on graft file with comments.

    Junio C Hamano authored
    The graft file can contain comment lines and read_graft_line can
    return NULL for such an input, which should be skipped by the
    reader.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-annotate: no need to exec blame; it is built-in now.

    Junio C Hamano authored
Commits on Nov 9, 2006
  1. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
      git-svn: fix dcommit losing changes when out-of-date from svn
      git-svn: don't die on rebuild when --upgrade is specified
      git-svn: avoid printing filenames of files we're not tracking
  2. git-rebase: Use --ignore-if-in-upstream option when executing git-for…

    Robert Shearman authored Junio C Hamano committed
    …mat-patch.
    
    This reduces the number of conflicts when rebasing after a series of
    patches to the same piece of code is committed upstream.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Documentation: move blame examples

    Junio C Hamano authored
    This moves the example to specify a line range with regexps to
    a later part of the manual page that has similar examples.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      Nicer error messages in case saving an object to db goes wrong
  5. git-svn: fix dcommit losing changes when out-of-date from svn

    Eric Wong authored Junio C Hamano committed
    There was a bug in dcommit (and commit-diff) which caused deltas
    to be generated against the latest version of the changed file
    in a repository, and not the revision we are diffing (the tree)
    against locally.
    
    This bug can cause recent changes to the svn repository to be
    silently clobbered by git-svn if our repository is out-of-date.
    
    Thanks to Steven Grimm for noticing the bug.
    
    The (few) people using the commit-diff command are now required
    to use the -r/--revision argument.  dcommit usage is unchanged.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git-svn: don't die on rebuild when --upgrade is specified

    Eric Wong authored Junio C Hamano committed
    --copy-remote and --upgrade are rarely (never?) used together,
    so if --copy-remote is specified, that means the user really
    wanted to copy the remote ref, and we should fail if that fails.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. git-svn: avoid printing filenames of files we're not tracking

    Eric Wong authored Junio C Hamano committed
    This is purely an aesthetic change, we already skip importing of
    files that don't affect the subdirectory we import.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Nicer error messages in case saving an object to db goes wrong

    Petr Baudis authored Junio C Hamano committed
    Currently the error e.g. when pushing to a read-only repository is quite
    confusing, this attempts to clean it up, unifies error reporting between
    various object writers and uses error() on couple more places.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. gitweb: fix unmatched div in commitdiff

    Junio C Hamano authored
    When the last filepair changed only metainfo we failed to close the
    extended header <div>.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. gitweb: protect commit messages from controls.

    Junio C Hamano authored
    The same change as the previous.  It is rather sad that commit log
    message parser gives list of chomped lines while tag message parser
    gives unchomped ones.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. gitweb: protect blob and diff output lines from controls.

    Junio C Hamano authored
    This revealed that the output from blame and tag was not chomped
    properly and was relying on HTML output not noticing that extra
    whitespace that resulted from the newline, which was also fixed.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. git-pickaxe: retire pickaxe

    Junio C Hamano authored
    Just make it take over blame's place.  Documentation and command
    have all stopped mentioning "git-pickaxe".  The built-in synonym
    is left in the command table, so you can still say "git pickaxe",
    but it probably is a good idea to retire it as well.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 8, 2006
  1. Merge git://git.kernel.org/pub/scm/gitk/gitk

    Junio C Hamano authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      [PATCH] gitk: Fix nextfile() and add prevfile()
  2. git-status: quote LF in its output

    Junio C Hamano authored
    Otherwise, commit log template would get the remainder of the
    filename start on a new line unquoted and the log gets messed
    up.
    
    I initially considered using the full quote_c_style(), but the
    output from the command is primarily for human consumption so
    chose to leave other control characters and bytes with high-bits
    unmolested.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. gitweb: do not give blame link unconditionally in diff-tree view

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. @jnareb

    gitweb: New improved patchset view

    jnareb authored Junio C Hamano committed
    Replace "gitweb diff header" with its full sha1 of blobs and replace
    it by "git diff" header and extended diff header. Change also somewhat
    highlighting of diffs.
    
    Added `file_type_long' subroutine to convert file mode in octal to
    file type description (only for file modes which used by git).
    
    Changes:
    * "gitweb diff header" which looked for example like below:
        file:_<sha1 before>_ -> file:_<sha1 after>_
      where 'file' is file type and '<sha1>' is full sha1 of blob is
      changed to
        diff --git _a/<file before>_ _b/<file after>_
      In both cases links are visible and use default link style. If file
      is added, a/<file> is not hyperlinked. If file is deleted, b/<file>
      is not hyperlinked.
    * there is added "extended diff header", with <path> and <hash>
      hyperlinked (and <hash> shortened to 7 characters), and <mode>
      explained: '<mode>' is extended to '<mode> (<file type description>)',
      where added text is slightly lighter to easy distinguish that it
      was added (and it is difference from git-diff output).
    * from-file/to-file two-line header lines have slightly darker color
      than removed/added lines.
    * chunk header has now delicate line above for easier finding chunk
      boundary, and top margin of 2px, both barely visible.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. @jnareb

    gitweb: Use character or octal escape codes (and add span.cntrl) in e…

    jnareb authored Junio C Hamano committed
    …sc_path
    
    Instead of simply hiding control characters in esc_path by replacing
    them with '?', use Character Escape Codes (CEC) i.e. alphabetic
    backslash sequences like those found in C programming language and
    many other languages influenced by it, such as Java and Perl.  If
    control characted doesn't have corresponding character escape code,
    use octal char sequence to escape it.
    
    Alternatively, controls can be replaced with Unicode Control
    Pictures U+2400 - U+243F (9216 - 9279), the Unicode characters
    reserved for representing control characters when it is
    necessary to print or display them.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. @jnareb

    gitweb: Better git-unquoting and gitweb-quoting of pathnames

    jnareb authored Junio C Hamano committed
    Extend unquote subroutine, which unquotes quoted and escaped filenames
    which git may return, to deal not only with octal char sequence
    quoting, but also quoting ordinary characters including '\"' and '\\'
    which are respectively quoted '"' and '\', and to deal also with
    C escape sequences including '\t' for TAB and '\n' for LF.
    
    Add esc_path subroutine for gitweb quoting and HTML escaping filenames
    (currently it does equivalent of ls' --hide-control-chars, which means
    showing undisplayable characters (including '\n' and '\t') as '?'
    (question mark) character, and use 'span' element with cntrl CSS class
    to help rendering them differently.
    
    Convert gitweb to use esc_path correctly to print pathnames.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. gitweb: minimally fix "fork" support.

    Junio C Hamano authored
    A forked project is defined to be $projname/$forkname.git for
    $projname.git; the code did not check this correctly and mistook
    $projname/.git to be a fork of itself.  This minimally fixes the
    breakage.
    
    Also forks were not checked when index.aux file was in use.
    Listing the forked ones in index.aux would show them also on the
    toplevel index which may go against the hierarchical nature of
    forks, but again this is a minimal fix to whip it in a better
    shape suitable to be in the 'master' branch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. gitweb: fix disabling of "forks"

    Junio C Hamano authored
    Apparently this code was never tested without "forks".  check-feature
    returns a one-element list (0) when disabled, and assigning that to a
    scalar variable made it to be called in a scalar context, which meant
    my $check_forks = gitweb_check_feature("forks") were always 1!
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. GIT 1.4.3-rc1

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      remove an unneeded test
  11. Merge branch 'jc/pickaxe'

    Junio C Hamano authored
  12. git-pickaxe: allow "-L <something>,+N"

    Junio C Hamano authored
    With this,
    
    	git pickaxe -L '/--progress/,+20' v1.4.0 -- pack-objects.c
    
    gives you 20 lines starting from the first occurrence of
    '--progress' in pack-objects, digging from v1.4.0 version.
    
    You can also say
    
    	git pickaxe -L '/--progress/,-5' v1.4.0 -- pack-objects.c
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. git-pack-objects progress flag documentation and cleanup

    Nicolas Pitre authored Junio C Hamano committed
    This adds documentation for --progress and --all-progress, remove a
    duplicate --progress handling and make usage string more readable.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 7, 2006
  1. remove an unneeded test

    Tero Roponen authored Junio C Hamano committed
    In wt-status.c there is a test which does nothing.
    This patch removes it.
    
    Signed-off-by: Tero Roponen <teanropo@jyu.fi>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'jc/read-tree'

    Junio C Hamano authored
    * jc/read-tree:
      t6022: ignoring untracked files by merge-recursive when they do not matter
      merge-recursive: adjust to loosened "working file clobbered" check
      merge-recursive: make a few functions static.
      merge-recursive: use abbreviated commit object name.
      merge: loosen overcautious "working file will be lost" check.
  3. Merge branch 'np/index-pack'

    Junio C Hamano authored
    * np/index-pack:
      remove .keep pack lock files when done with refs update
      have index-pack create .keep file more carefully
      improve fetch-pack's handling of kept packs
      git-fetch can use both --thin and --keep with fetch-pack now
      Teach receive-pack how to keep pack files based on object count.
      Allow pack header preprocessing before unpack-objects/index-pack.
      Remove unused variable in receive-pack.
      Revert "send-pack --keep: do not explode into loose objects on the receiving end."
      missing small substitution
      Teach git-index-pack how to keep a pack file.
      Only repack active packs by skipping over kept packs.
      Allow short pack names to git-pack-objects --unpacked=.
      send-pack --keep: do not explode into loose objects on the receiving end.
      index-pack: minor fixes to comment and function name
      enhance clone and fetch -k experience
      mimic unpack-objects when --stdin is used with index-pack
      add progress status to index-pack
      make index-pack able to complete thin packs.
      enable index-pack streaming capability
Something went wrong with that request. Please try again.