Permalink
Commits on Mar 22, 2010
  1. Git 1.7.0.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 22, 2010
  2. Merge branch 'maint-1.6.6' into maint

    * maint-1.6.6:
      Documentation/git-clone: Transform description list into item list
      Documentation/urls: Remove spurious example markers
      Documentation/gitdiffcore: Remove misleading date in heading
      Documentation/git-reflog: Fix formatting of command lists
    gitster committed Mar 22, 2010
Commits on Mar 21, 2010
  1. .mailmap: Map the the first submissions of MJG by e-mail

    so that git shortlog with '-e' coalesces all my commits.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 21, 2010
  2. Documentation/git-clone: Transform description list into item list

    so that the list of examples is formatted in the same way as for
    git-fetch, and, more importantly, the different identation for the
    code blocks in the examples (compared to the immediately preceding code
    blocks from url.txt) doesn't look like misformatted, but is clarified by
    the items' bullets.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 21, 2010
  3. Documentation/urls: Remove spurious example markers

    In urls.txt (which is included from git-{clone,fetch,push}.txt)
    several item lists are surrounded by example block markers. This is
    problematic for two reasons:
    
    - None of these lists are example lists, so they should not be marked as
      such semantically.
    - The html output looks weird (bulleted list with left sidebar).
    
    Therefore, remove the example block markers. Output by the man backend
    is unaffected.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 21, 2010
  4. Documentation/gitdiffcore: Remove misleading date in heading

    Ever since the automatic conversion into man form, the heading
    contained a misidentified subheading reading "June 2005".
    Remove this since the documentation is more recent, and the correct
    date is in the footer.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 21, 2010
  5. Documentation/git-reflog: Fix formatting of command lists

    A misplaced list continuation mark appears literally in the
    rendered doc. Fix this by removing it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 21, 2010
Commits on Mar 20, 2010
  1. Update draft release notes to 1.7.0.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 20, 2010
  2. fetch: Fix minor memory leak

    A temporary struct ref is allocated in store_updated_refs() but not
    freed.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Mar 15, 2010
  3. fetch: Future-proof initialization of a refspec on stack

    The open-coded version to initialize each and every member will break
    when a new member is added to the structure.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Mar 12, 2010
  4. fetch: Check for a "^{}" suffix with suffixcmp()

    Otherwise, we will check random bytes for ref names < 3 characters.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Andreas Gruenbacher committed with gitster Mar 13, 2010
  5. daemon: parse_host_and_port SIGSEGV if port is specified

    This typo will lead to git-daemon dying any time the connect
    string includes a port after the host= attribute. This can lead
    for example to one of the following error messages on the client
    side when someone tries git clone git://...:<port>.
    
    When the daemon is running on localhost:
      fatal: The remote end hung up unexpectedly
    
    or when the daemon is connected through an ssh tunnel:
      fatal: protocol error: bad line length character: erro
    
    In the latter case 'erro' comes from the daemon's reply:
      error: git-daemon died of signal 11
    
    Signed-off-by: Imre Deak <imre.deak@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ideak committed with gitster Mar 20, 2010
  6. Makefile: Fix CDPATH problem

    If CDPATH is set, "cd" prints its destination to stdout, causing
    the common (cd a && tar cf - .) | (cd b && tar xf -) idiom to fail.
    For example:
    
     make -C templates DESTDIR='' install
     make[1]: Entering directory `/users/e477610/exptool/src/git-1.7.0.2/templates'
     install -d -m 755 '/home/e477610/exptool/share/git-core/templates'
     (cd blt && gtar cf - .) | \
    	(cd '/home/e477610/exptool/share/git-core/templates' && umask 022 && gtar xof -)
     gtar: This does not look like a tar archive
    
    Most git scripts already protect against use of CDPATH through
    git-sh-setup, but the Makefile doesn’t.
    
    Reported-by: Michael Cox <mhcox@bluezoosoftware.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Mar 20, 2010
  7. pull: replace unnecessary sed invocation

    Getting the shortened branch name is as easy as using the shell's
    parameter expansion.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Mar 18, 2010
Commits on Mar 17, 2010
  1. Documentation: receive.denyCurrentBranch defaults to 'refuse'

    acd2a45 (Refuse updating the current branch in a non-bare repository
    via push, 2009-02-11) changed the default to refuse such a push, but
    it forgot to update the docs.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 17, 2010
  2. bash: complete *_HEAD refs if present

    We already complete HEAD, of course, and might as well complete the other
    common refs mentioned in the rev-parse man page: FETCH_HEAD, ORIG_HEAD, and
    MERGE_HEAD.
    
    Signed-off-by: Ian Ward Comfort <icomfort@stanford.edu>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    icomfort committed with gitster Mar 17, 2010
Commits on Mar 15, 2010
  1. Documentation/git-read-tree: clarify 2-tree merge

    Clarify the description of the 2-tree merge by defining the terms
    which are used in the table, and by applying some small linguistic
    changes.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 15, 2010
  2. Documentation/git-read-tree: fix table layout

    Asciidoc takes the first non-space character in the first line of the
    paragraph as a reference point for preformatted layout, so adjust to
    that to make the table align.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 15, 2010
Commits on Mar 14, 2010
  1. don't use default revision if a rev was specified

    If a revision is specified, it happens not to have any commits, don't
    use the default revision.  By doing so, surprising and undesired
    behavior can happen, such as showing the reflog for HEAD when a branch
    was specified.
    
    [jc: squashed a test from René]
    
    Signed-off-by: Dave Olszewski <cxreg@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    cxreg committed with gitster Mar 13, 2010
Commits on Mar 13, 2010
  1. for_each_recent_reflog_ent(): use strbuf, fix offset handling

    As Vladimir reported, "git log -g refs/stash" surprisingly showed the reflog
    of HEAD if the message in the reflog file was too long.  To fix this, convert
    for_each_recent_reflog_ent() to use strbuf_getwholeline() instead of fgets(),
    for safety and to avoid any size limits for reflog entries.
    
    Also reverse the logic of the part of the function that only looks at file
    tails.  It used to close the file if fgets() succeeded.  The following
    fgets() call in the while loop was likely to fail in this case, too, so
    passing an offset to for_each_recent_reflog_ent() never worked.  Change it to
    error out if strbuf_getwholeline() fails instead.
    
    Reported-by: Vladimir Panteleev <vladimir@thecybershadow.net>
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Mar 13, 2010
  2. t/Makefile: remove test artifacts upon "make clean"

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 13, 2010
  3. blame: fix indent of line numbers

    Correct the calculation of the number of digits for line counts of the
    form 10^n-1 (9, 99, ...) in lineno_width().  This makes blame stop
    printing an extra space before the line numbers of files with that many
    total lines.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Mar 13, 2010
Commits on Mar 12, 2010
  1. t9400: Use test_cmp when appropriate

    Consistently using test_cmp would make debugging test scripts far easier,
    as output from them run under "-v" option becomes readable.
    
    Besides, some platforms' "diff" implementations lack "-q" option.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 12, 2010
Commits on Mar 8, 2010
  1. Merge accumulated fixes to prepare for 1.7.0.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 8, 2010
  2. Merge branch 'mw/maint-gcc-warns-unused-write' into maint

    * mw/maint-gcc-warns-unused-write:
      run-command.c: fix build warnings on Ubuntu
    gitster committed Mar 8, 2010
  3. Merge branch 'fn/maint-mkdtemp-compat' into maint

    * fn/maint-mkdtemp-compat:
      Fix gitmkdtemp: correct test for mktemp() return value
    gitster committed Mar 8, 2010
  4. Merge branch 'gb/maint-submodule-env' into maint

    * gb/maint-submodule-env:
      is_submodule_modified(): clear environment properly
      submodules: ensure clean environment when operating in a submodule
      shell setup: clear_local_git_env() function
      rev-parse: --local-env-vars option
      Refactor list of of repo-local env vars
    gitster committed Mar 8, 2010
  5. Merge branch 'as/maint-expire' into maint

    * as/maint-expire:
      reflog: honor gc.reflogexpire=never
      prune: honor --expire=never
    gitster committed Mar 8, 2010
  6. Merge branch 'ml/maint-grep-doc' into maint

    * ml/maint-grep-doc:
      grep docs: document --no-index option
      grep docs: --cached and <tree>... are incompatible
      grep docs: use AsciiDoc literals consistently
      grep docs: pluralize "Example" section
    gitster committed Mar 8, 2010
  7. Merge branch 'jk/maint-push-tracking-wo-remote' into maint

    * jk/maint-push-tracking-wo-remote:
      push: fix segfault for odd config
    gitster committed Mar 8, 2010
  8. Merge branch 'jc/fetch-param' into maint

    * jc/fetch-param:
      fetch --all/--multiple: keep all the fetched branch information
      builtin-fetch --all/--multi: propagate options correctly
      t5521: fix and modernize
    gitster committed Mar 8, 2010
  9. Merge branch 'ne/pack-local-doc' into maint

    * ne/pack-local-doc:
      pack-objects documentation: Fix --honor-pack-keep as well.
      pack-objects documentation: reword "objects that appear in the standard input"
      Documentation: pack-objects: Clarify --local's semantics.
    gitster committed Mar 8, 2010
  10. Merge branch 'jk/maint-add--interactive-delete' into maint

    * jk/maint-add--interactive-delete:
      add-interactive: fix bogus diff header line ordering
    gitster committed Mar 8, 2010
  11. Merge branch 'mm/mkstemps-mode-for-packfiles' into maint

    * mm/mkstemps-mode-for-packfiles:
      Use git_mkstemp_mode instead of plain mkstemp to create object files
      git_mkstemps_mode: don't set errno to EINVAL on exit.
      Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
      git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
      Move gitmkstemps to path.c
      Add a testcase for ACL with restrictive umask.
    gitster committed Mar 8, 2010
  12. Merge branch 'jc/maint-fix-mailinfo-strip' into maint

    * jc/maint-fix-mailinfo-strip:
      mailinfo: do not strip leading spaces even for a header line
    gitster committed Mar 8, 2010