Permalink
Commits on May 25, 2012
  1. Git 1.7.10.3

    gitster committed May 25, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'hv/submodule-alt-odb' into maint

    gitster committed May 25, 2012
    When a submodule repository uses alternate object store mechanism, some
    commands that were started from the superproject did not notice it and
    failed with "No such object" errors.  The subcommands of "git submodule"
    command that recursed into the submodule in a separate process were OK;
    only the ones that cheated and peeked directly into the submodule's
    repository from the primary process were affected.
    
    By Heiko Voigt
    * hv/submodule-alt-odb:
      teach add_submodule_odb() to look for alternates
  3. Merge branch 'bp/diff-no-index-strbuf-fix' into maint

    gitster committed May 25, 2012
    The directory path used in "git diff --no-index", when it recurses
    down, was broken with a recent update after v1.7.10.1 release.
    
    By Bobby Powers
    * bp/diff-no-index-strbuf-fix:
      diff --no-index: don't leak buffers in queue_diff
      diff --no-index: reset temporary buffer lengths on directory iteration
  4. fmt-merge-message: add empty line between tag and signature verification

    torvalds authored and gitster committed May 25, 2012
    When adding the information from a tag, put an empty line between the
    message of the tag and the commented-out signature verification
    information.
    
    At least for the kernel workflow, I often end up re-formatting the message
    that people send me in the tag data. In that situation, putting the tag
    message and the tag signature verification back-to-back then means that
    normal editor "reflow parapgraph" command will get confused and think that
    the signature is a continuation of the last message paragraph.
    
    So I always end up having to first add an empty line, and then go back and
    reflow the last paragraph. Let's just do it in git directly.
    
    The extra vertical space also makes the verification visually stand out
    more from the user-supplied message, so it looks a bit more readable to me
    too, but that may be just an odd personal preference.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. config doc: remove confusion about relative GIT_DIR from FILES section

    jrn authored and gitster committed May 25, 2012
    From the FILES section of the git-config(1) manual:
    
    	$GIT_DIR/config::
    		Repository specific configuration file. (The filename is
    		of course relative to the repository root, not the working
    		directory.)
    
    That's confusing because $GIT_DIR really is relative to the working
    directory.
    
    	$ GIT_DIR=.git GIT_EDITOR='pwd; echo editing'
    	$ export GIT_DIR GIT_EDITOR
    	$ git config --edit --local
    	/home/jrn/src/git/Documentation
    	editing .git/config
    
    It turns out that the comment is a remnant from older days when the
    heading said ".git/config" (which is indeed relative to the top of the
    worktree).
    
    It was only when the heading was changed to refer more precisely to
    <git dir>/config (see v1.5.3.2~18, AsciiDoc tweak to avoid leading
    dot, 2007-09-14) that the parenthesis stopped making sense.  Remove
    it.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Update draft release notes to 1.7.10.3

    gitster committed May 25, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Merge branch 'jk/maint-status-porcelain-z-b' into maint

    gitster committed May 25, 2012
    "git status --porcelain" ignored "--branch" option by mistake.  The output
    for "git status --branch -z" was also incorrect and did not terminate the
    record for the current branch name with NUL as asked.
    
    By Jeff King
    * jk/maint-status-porcelain-z-b:
      status: respect "-b" for porcelain format
      status: fix null termination with "-b"
      status: refactor null_termination option
      commit: refactor option parsing
Commits on May 24, 2012
  1. osxkeychain: pull make config from top-level directory

    peff authored and gitster committed May 23, 2012
    The default compiler and cflags were mostly "works for me"
    when I built the original version. We need to be much less
    careful here than usual, because we know we are building
    only on OS X.  But it's only polite to at least respect the
    CFLAGS and CC definitions that the user may have provided
    earlier.
    
    While we're at it, let's update our definitions and rules to
    be more like the top-level Makefile; default our CFLAGS to
    include -O2, and make sure we use CFLAGS and LDFLAGS when
    linking.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 20, 2012
  1. Consistently use "superproject" instead of "supermodule"

    jlehmann authored and gitster committed May 20, 2012
    We fairly consistently say "superproject" and never "supermodule" these
    days. But there are seven occurrences of "supermodule" left in the current
    work tree. Three appear in Release Notes for 1.5.3 and 1.7.7, three in
    test names and one in a C-code comment.
    
    Replace all occurrences of "supermodule" outside of the Release Notes
    (which shouldn't be changed after the fact) with "superproject" for
    consistency.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t3404: begin "exchange commits with -p" test with correct preconditions

    j6t authored and gitster committed May 19, 2012
    The test case shows a bug in 'rebase -p', but even if the bug were fixed
    the test would fail because it did not ensure that the preconditions match
    the postconditions that were checked. Insert the suitable 'git checkout'.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 16, 2012
  1. diff --no-index: don't leak buffers in queue_diff

    bpowers authored and gitster committed May 16, 2012
    queue_diff uses two strbufs, and at the end of the function
    strbuf_reset was called.  This only reset the length of the buffer -
    any allocated memory was leaked.  Using strbuf_release fixes this.
    
    Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
    Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. diff --no-index: reset temporary buffer lengths on directory iteration

    bpowers authored and gitster committed May 16, 2012
    Commit 875b91b (diff --no-index: use strbuf for temporary pathnames,
    2012-04-25) introduced a regression when using diff --no-index with
    directories.  When iterating through a directory, the switch to strbuf
    from heap-allocated char arrays caused paths to form like 'dir/file1',
    'dir/file1file2', rather than 'dir/file1', 'dir/file2' as expected.
    
    Avoid this by resetting the paths variables to their original length
    before each iteration.
    
    Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
    Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 15, 2012
  1. l10n: de.po: translate 3 new messages

    ralfth committed May 15, 2012
    Translate 3 new messages for upcoming git 1.7.10.3.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
  2. l10n: zh_CN.po: translate 3 new messages

    jiangxin committed May 15, 2012
    Translate 3 new messages for upcoming git 1.7.10.3.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Commits on May 14, 2012
  1. l10n: Update git.pot (3 new, 2 removed messages)

    jiangxin committed May 14, 2012
    Generate po/git.pot from v1.7.10.2-35-g0b9f4:
    
     * 3 new l10n messages at lines: 2743, 2751, 2759.
    
     * 2 removed l10n messages from lines: 1879, 2757.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
  2. teach add_submodule_odb() to look for alternates

    hvoigt authored and gitster committed May 14, 2012
    Since we allow to link other object databases when loading a submodules
    database we should also load possible alternates.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

    gitster committed May 14, 2012
    By Ralf Thielow (6) and others
    via Jiang Xin
    * 'maint' of git://github.com/git-l10n/git-po:
      l10n: zh_CN.po: translate 1 new message
      l10n: de.po: translate one new message
      l10n: de.po: unify translation of "ahead" and "behind"
      l10n: de.po: collection of improvements
      l10n: de.po: translate "remote" as "extern"
      l10n: de.po: translate "track" as "beobachten"
      l10n: add new members to German translation team
      l10n: de.po: collection of suggestions
      l10n: de.po: translate "bad" as "ungültig" ("invalid")
      l10n: de.po: hopefully uncontroversial fixes
      l10n: de.po: translate "bare" as "bloß"
      l10n: Update git.pot (1 new messages)
  4. Start preparing for 1.7.10.3

    gitster committed May 14, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint

    gitster committed May 14, 2012
    Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and
    "log -g", depending on how the starting point ("master" vs "master@{0}" vs
    "master@{now}") and date formatting options (e.g. "--date=iso") are given
    on the command line.
    
    By Jeff King (4) and Junio C Hamano (1)
    * jk/maint-reflog-walk-count-vs-time:
      reflog-walk: tell explicit --date=default from not having --date at all
      reflog-walk: always make HEAD@{0} show indexed selectors
      reflog-walk: clean up "flag" field of commit_reflog struct
      log: respect date_mode_explicit with --format:%gd
      t1411: add more selector index/date tests
  6. Merge branch 'jk/doc-asciidoc-inline-literal' into maint

    gitster committed May 14, 2012
    By Jeff King
    * jk/doc-asciidoc-inline-literal:
      docs: stop using asciidoc no-inline-literal
  7. Merge branch 'ef/checkout-empty' into maint

    gitster committed May 14, 2012
    Running "git checkout" on an unborn branch used to corrupt HEAD
    (regression in 1.7.10); this makes it error out.
    
    By Erik Faye-Lund
    * ef/checkout-empty:
      checkout: do not corrupt HEAD on empty repo
  8. Merge branch 'jk/maint-tformat-with-z' into maint

    gitster committed May 14, 2012
    By Jan Krüger (1) and Junio C Hamano (1)
    * jk/maint-tformat-with-z:
      log-tree: the previous one is still not quite right
      log-tree: use custom line terminator in line termination mode
  9. Merge branch 'js/checkout-detach-count' into maint

    gitster committed May 14, 2012
    When checking out another commit from an already detached state, we used
    to report all commits that are not reachable from any of the refs as
    lossage, but some of them might be reachable from the new HEAD, and there
    is no need to warn about them.
    
    By Johannes Sixt
    * js/checkout-detach-count:
      checkout (detached): truncate list of orphaned commits at the new HEAD
      t2020-checkout-detach: check for the number of orphaned commits
  10. Merge branch 'ef/maint-clone-progress-fix' into maint

    gitster committed May 14, 2012
    Some time ago, "git clone" lost the progress output for its "checkout"
    phase; when run without any "--quiet" option, it should give progress to
    the lengthy operation.
    
    By Erik Faye-Lund
    * ef/maint-clone-progress-fix:
      clone: fix progress-regression
  11. link to gitmodules page at the beginning of git-submodule documentation

    hvoigt authored and gitster committed May 14, 2012
    This way the user does not have to scroll down to the bottom to find
    it.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. pack-protocol: fix first-want separator in the examples

    carlosmn authored and gitster committed May 11, 2012
    When sending the "want" list, the capabilities list is separated from
    the obj-id by a SP instead of NUL as in the ref advertisement. The
    text is correct, but the examples wrongly show the separator as
    NUL. Fix the example so it uses SP.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 12, 2012
  1. l10n: zh_CN.po: translate 1 new message

    jiangxin committed May 8, 2012
    Translate new message '[new ref]' since git 1.7.10.1.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Commits on May 11, 2012
  1. Git 1.7.10.2

    gitster committed May 11, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/diff-algo-cleanup' into maint

    gitster committed May 11, 2012
    * jc/diff-algo-cleanup:
      xdiff: PATIENCE/HISTOGRAM are not independent option bits
      xdiff: remove XDL_PATCH_* macros
  3. Merge branch 'ct/advise-push-default' into maint

    gitster committed May 11, 2012
    The cases "git push" fails due to non-ff can be broken into three
    categories; each case is given a separate advise message.
    
    By Christopher Tiwald (2) and Jeff King (1)
    * ct/advise-push-default:
      Fix httpd tests that broke when non-ff push advice changed
      clean up struct ref's nonfastforward field
      push: Provide situational hints for non-fast-forward errors
  4. Merge branch 'js/fast-import-test-9300' into maint

    gitster committed May 11, 2012
    By Johannes Sixt
    * js/fast-import-test-9300:
      t9300-fast-import: avoid 'exit' in test_expect_success snippets
  5. Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint

    gitster committed May 11, 2012
    "git repack" used to write out unreachable objects as loose objects
    when repacking, even if such loose objects will immediately pruned
    due to its age.
    
    By Jeff King
    * jk/repack-no-explode-objects-from-old-pack:
      gc: use argv-array for sub-commands
      argv-array: add a new "pushl" method
      argv-array: refactor empty_argv initialization
      gc: do not explode objects which will be immediately pruned
  6. Merge branch 'ah/maint-grep-double-init' into maint

    gitster committed May 11, 2012
    By Angus Hammond
    * ah/maint-grep-double-init:
      grep.c: remove redundant line of code
  7. Merge branch 'fa/maint-config-doc' into maint

    gitster committed May 11, 2012
    By Florian Achleitner
    * fa/maint-config-doc:
      Documentation/git-config: describe and clarify "--local <file>" option
  8. Merge branch 'rs/unpack-trees-leakfix' into maint

    gitster committed May 11, 2012
    By René Scharfe
    * rs/unpack-trees-leakfix:
      unpack-trees: plug minor memory leak
      unpack-trees: don't perform any index operation if we're not merging