Permalink
Commits on Mar 26, 2012
  1. Git 1.7.9.5

    gitster committed Mar 26, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jn/maint-fast-import-empty-ls' into maint

    gitster committed Mar 26, 2012
    * jn/maint-fast-import-empty-ls:
      fast-import: don't allow 'ls' of path with empty components
      fast-import: leakfix for 'ls' of dirty trees
  3. Merge branch 'ph/rerere-doc' into maint

    gitster committed Mar 26, 2012
    * ph/rerere-doc:
      rerere: Document 'rerere remaining'
  4. Merge branch 'ms/maint-config-error-at-eol-linecount' into maint

    gitster committed Mar 26, 2012
    * ms/maint-config-error-at-eol-linecount:
      config: report errors at the EOL with correct line number
  5. grep doc: add --break / --heading / -W to synopsis

    MarkLodato authored and gitster committed Mar 26, 2012
    All of the other options were included in the synopsis, so it makes
    sense to include these as well.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Documentation: improve description of GIT_EDITOR and preference order

    MestreLion authored and gitster committed Mar 23, 2012
    Previously GIT_EDITOR was not listed in git(1) "Environment Variables" section,
    which could be very confusing to users. Include it in "other" subsection along
    with a link to git-var(1), since that is the page that fully describes all
    places where editor can be set and also their preference order.
    
    Also, git-var(1) did not say that hardcoded fallback 'vi' may have been changed
    at build time. A user could be puzzled if 'nano' pops up even when none of the
    mentioned environment vars or config.editor are set. Clarify this.
    
    Ideally, the build system should be changed to reflect the chosen fallback
    editor when creating the man pages. Not sure if that is even possible though.
    
    Signed-off-by: Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. documentation: fix alphabetic ordered list for git-rebase man page

    Nelson Benitez Leon authored and gitster committed Mar 23, 2012
    An alphabetic ordered list (a.) is converted to numerical in
    the man page (1.) so context comments naming 'a' were confusing,
    fix that by not using ordered list notation for 'a' anb 'b' items.
    
    Signed-off-by: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 20, 2012
  1. Merge branch 'maint-1.7.8' into maint

    gitster committed Mar 20, 2012
    * maint-1.7.8:
      t/Makefile: Use $(sort ...) explicitly where needed
      gitweb: Fix actionless dispatch for non-existent objects
      i18n of multi-line advice messages
  2. Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8

    gitster committed Mar 20, 2012
    * ks/sort-wildcard-in-makefile:
      t/Makefile: Use $(sort ...) explicitly where needed
  3. Merge branch 'jc/advise-i18n' into maint-1.7.8

    gitster committed Mar 20, 2012
    * jc/advise-i18n:
      i18n of multi-line advice messages
  4. Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8

    gitster committed Mar 20, 2012
    * jn/gitweb-unspecified-action:
      gitweb: Fix actionless dispatch for non-existent objects
Commits on Mar 12, 2012
  1. Git 1.7.9.4

    gitster committed Mar 12, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'tr/maint-bundle-boundary' into maint

    gitster committed Mar 12, 2012
    "git bundle" did not record boundary commits correctly when there
    are many of them.
    
    By Thomas Rast
    * tr/maint-bundle-boundary:
      bundle: keep around names passed to add_pending_object()
      t5510: ensure we stay in the toplevel test dir
      t5510: refactor bundle->pack conversion
  3. Merge branch 'jc/maint-diff-patch-header' into maint

    gitster committed Mar 12, 2012
    "git diff-index" and its friends at the plumbing level showed the
    "diff --git" header and nothing else for a path whose cached stat
    info is dirty without actual difference when asked to produce a
    patch. This was a longstanding bug that we could have fixed long
    time ago.
    
    By Junio C Hamano
    * jc/maint-diff-patch-header:
      diff -p: squelch "diff --git" header for stat-dirty paths
      t4011: illustrate "diff-index -p" on stat-dirty paths
      t4011: modernise style
  4. Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into…

    gitster committed Mar 12, 2012
    … maint
    
    "gitweb" did use quotemeta() to prepare search string when asked to
    do a fixed-string project search, but did not use it by mistake and
    used the user-supplied string instead.
    
    By Jakub Narebski
    * jn/maint-do-not-match-with-unsanitized-searchtext:
      gitweb: Fix fixed string (non-regexp) project search
  5. Merge branch 'jc/am-3-nonstandard-popt' into maint

    gitster committed Mar 12, 2012
    The code to synthesize the fake ancestor tree used by 3-way merge
    fallback in "git am" was not prepared to read a patch created with
    a non-standard -p<num> value.
    
    * jc/am-3-nonstandard-popt:
      test: "am -3" can accept non-standard -p<num>
      am -3: allow nonstandard -p<num> option
  6. config: report errors at the EOL with correct line number

    Martin Stenberg authored and gitster committed Mar 9, 2012
    A section in a config file with a missing "]" reports the next line
    as bad, same goes to a value with a missing end quote.
    
    This happens because the error is not detected until the end of the
    line, when line number is already increased. Fix this by decreasing
    line number by one for these cases.
    
    Signed-off-by: Martin Stenberg <martin@gnutiken.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 10, 2012
  1. fast-import: don't allow 'ls' of path with empty components

    jrn committed Mar 10, 2012
    As the fast-import manual explains:
    
    	The value of <path> must be in canonical form. That is it must
    	not:
    	. contain an empty directory component (e.g. foo//bar is invalid),
    	. end with a directory separator (e.g. foo/ is invalid),
    	. start with a directory separator (e.g. /foo is invalid),
    
    Unfortunately the "ls" command accepts these invalid syntaxes and
    responds by declaring that the indicated path is missing.  This is too
    subtle and causes importers to silently misbehave; better to error out
    so the operator knows what's happening.
    
    The C, R, and M commands already error out for such paths.
    
    Reported-by: Andrew Sayers <andrew-git@pileofstuff.org>
    Analysis-by: David Barr <davidbarr@google.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  2. fast-import: leakfix for 'ls' of dirty trees

    jrn committed Mar 10, 2012
    When the chosen directory has changed since it was last written to
    pack, "tree_content_get" makes a deep copy of its content to scribble
    on while computing the tree name, which we forgot to free.
    
    This leak has been present since the 'ls' command was introduced in
    v1.7.5-rc0~3^2~33 (fast-import: add 'ls' command, 2010-12-02).
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Commits on Mar 8, 2012
  1. rerere: Document 'rerere remaining'

    phord authored and gitster committed Mar 8, 2012
    This adds the 'remaining' command to the documentation of
    'git rerere'. This command was added in ac49f5c (Feb 16 2011;
    Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>) but
    it was never documented.
    
    Touch up the other rerere commands to reduce noise.
    
    First noticed by Vincent van Ravesteijn.
    
    Signed-off-by: Phil Hord <phil.hord@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 6, 2012
  1. gitweb: Fix fixed string (non-regexp) project search

    jnareb authored and gitster committed Mar 2, 2012
    Use $search_regexp, where regex metacharacters are quoted, for
    searching projects list, rather than $searchtext, which contains
    original search term.
    
    Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t5704: fix nonportable sed/grep usages

    Thomas Rast authored and gitster committed Mar 6, 2012
    OS X's sed and grep would complain with (respectively)
    
      sed: 1: "/^-/{p;q}": extra characters at the end of q command
      grep: Regular expression too big
    
    For sed, use an explicit ; to terminate the q command.
    
    For grep, spell the "40 hex digits" explicitly in the regex, which
    should be safe as other tests already use this and we haven't got
    breakage reports on OS X about them.
    
    Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'maint-1.7.8' into maint

    gitster committed Mar 6, 2012
    By Thomas Rast
    * maint-1.7.8:
      Document the --histogram diff option
  4. Merge branch 'maint-1.7.7' into maint-1.7.8

    gitster committed Mar 6, 2012
    By Thomas Rast
    * maint-1.7.7:
      Document the --histogram diff option
  5. Document the --histogram diff option

    trast authored and gitster committed Mar 6, 2012
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 5, 2012
  1. Git 1.7.9.3

    gitster committed Mar 5, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/doc-merge-options' into maint

    gitster committed Mar 5, 2012
    * jc/doc-merge-options:
      Documentation/merge-options.txt: group "ff" related options together
  3. Merge branch 'cn/maint-rev-list-doc' into maint

    gitster committed Mar 5, 2012
    * cn/maint-rev-list-doc:
      Documentation: use {asterisk} in rev-list-options.txt when needed
  4. fast-import: zero all of 'struct tag' to silence valgrind

    trast authored and gitster committed Mar 5, 2012
    When running t9300, valgrind (correctly) complains about an
    uninitialized value in write_crash_report:
    
      ==2971== Use of uninitialised value of size 8
      ==2971==    at 0x4164F4: sha1_to_hex (hex.c:70)
      ==2971==    by 0x4073E4: die_nicely (fast-import.c:468)
      ==2971==    by 0x43284C: die (usage.c:86)
      ==2971==    by 0x40420D: main (fast-import.c:2731)
      ==2971==  Uninitialised value was created by a heap allocation
      ==2971==    at 0x4C29B3D: malloc (vg_replace_malloc.c:263)
      ==2971==    by 0x433645: xmalloc (wrapper.c:35)
      ==2971==    by 0x405DF5: pool_alloc (fast-import.c:619)
      ==2971==    by 0x407755: pool_calloc.constprop.14 (fast-import.c:634)
      ==2971==    by 0x403F33: main (fast-import.c:3324)
    
    Fix this by zeroing all of the 'struct tag'.  We would only need to
    zero out the 'sha1' field, but this way seems more future-proof.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Update draft release notes to 1.7.9.3 for the last time

    gitster committed Mar 5, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'cn/maint-branch-with-bad' into maint

    gitster committed Mar 5, 2012
    * cn/maint-branch-with-bad:
      branch: don't assume the merge filter ref exists
    
    Conflicts:
    	t/t3200-branch.sh
  7. Merge branch 'jn/maint-gitweb-invalid-regexp' into maint

    gitster committed Mar 5, 2012
    * jn/maint-gitweb-invalid-regexp:
      gitweb: Handle invalid regexp in regexp search
  8. Merge branch 'nd/maint-verify-objects' into maint

    gitster committed Mar 5, 2012
    * nd/maint-verify-objects:
      rev-list: fix --verify-objects --quiet becoming --objects
      rev-list: remove BISECT_SHOW_TRIED flag
  9. Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint

    gitster committed Mar 5, 2012
    * jk/maint-avoid-streaming-filtered-contents:
      do not stream large files to pack when filters are in use
      teach dry-run convert_to_git not to require a src buffer
      teach convert_to_git a "dry run" mode
  10. Merge branch 'jb/filter-ignore-sigpipe' into maint

    gitster committed Mar 5, 2012
    * jb/filter-ignore-sigpipe:
      Ignore SIGPIPE when running a filter driver