Permalink
Commits on May 2, 2012
  1. Git 1.7.10.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 2, 2012
  2. Merge branch 'pw/fast-import-dataref-parsing' into maint

    The parser in "fast-import" did not diagnose ":9" style references that is
    not followed by required SP/LF as an error.
    
    By Pete Wyckoff
    * pw/fast-import-dataref-parsing:
      fast-import: tighten parsing of datarefs
    gitster committed May 2, 2012
  3. Merge branch 'it/fetch-pack-many-refs' into maint

    When "git fetch" encounters repositories with too many references, the
    command line of "fetch-pack" that is run by a helper e.g. remote-curl, may
    fail to hold all of them. Now such an internal invocation can feed the
    references through the standard input of "fetch-pack".
    
    By Ivan Todoroski
    * it/fetch-pack-many-refs:
      remote-curl: main test case for the OS command line overflow
      fetch-pack: test cases for the new --stdin option
      remote-curl: send the refs to fetch-pack on stdin
      fetch-pack: new --stdin option to read refs from stdin
    
    Conflicts:
    	t/t5500-fetch-pack.sh
    gitster committed May 2, 2012
  4. Merge branch 'jl/maint-submodule-recurse-fetch' into maint

    "git fetch" that recurses into submodules on demand did not check if it
    needs to go into submodules when non branches (most notably, tags) are
    fetched.
    
    By Jens Lehmann
    * jl/maint-submodule-recurse-fetch:
      submodules: recursive fetch also checks new tags for submodule commits
    gitster committed May 2, 2012
  5. Merge branch 'jc/maint-blame-minimal' into maint

    "git blame" started missing quite a few changes from the origin since we
    stopped using the diff minimalization by default in v1.7.2 era.
    
    Teach "--minimal" option to "git blame" to work around this regression.
    
    * jc/maint-blame-minimal:
      blame: accept --need-minimal
    gitster committed May 2, 2012
  6. Merge branch 'lp/maint-diff-three-dash-with-graph' into maint

    "log -p --graph" used with "--stat" had a few formatting error.
    
    By Lucian Poston
    * lp/maint-diff-three-dash-with-graph:
      t4202: add test for "log --graph --stat -p" separator lines
      log --graph: fix break in graph lines
      log --graph --stat: three-dash separator should come after graph lines
    gitster committed May 2, 2012
  7. Merge branch 'jk/rebase-i-submodule-conflict-only' into maint

    Giving "--continue" to a conflicted "rebase -i" session skipped a
    commit that only results in changes to submodules.
    
    By John Keeping
    * jk/rebase-i-submodule-conflict-only:
      rebase -i continue: don't skip commits that only change submodules
    gitster committed May 2, 2012
  8. Merge branch 'maint' of https://github.com/git-l10n/git-po

    By Byrial Jensen (2) and others
    via Jiang Xin (1) and Ralf Thielow (1)
    * 'maint' of https://github.com/git-l10n/git-po:
      l10n: Initial German translation
      l10n: Update Simplified Chinese translation
      l10n: Update git.pot (2 new messages)
      l10n: Add the German translation team and initialize de.po
      l10n: Add Danish team (da) to list of teams
      l10n: New da.po file with 0 translations
      l10n: Updated pt_PT language
    gitster committed May 2, 2012
Commits on May 1, 2012
  1. l10n: Initial German translation

    Helped-by: Thomas Kuchs
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    ralfth committed Apr 30, 2012
Commits on Apr 28, 2012
  1. l10n: Update Simplified Chinese translation

    Translate 2 new messages come from git maint branch.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Apr 28, 2012
  2. l10n: Update git.pot (2 new messages)

    Changes of po/git.pot from v1.7.10 to v1.7.10-55-g868d6
    
     * 2 new l10n messages at lines: 1583, 2730
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Apr 28, 2012
  3. Merge maint branch for tracking l10n updates of git stable version

    Use master branch to track l10n updates for git next release, while
    use maint branch to track l10n updates for git stable version.
    jiangxin committed Apr 28, 2012
  4. l10n: Add the German translation team and initialize de.po

    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    ralfth committed with jiangxin Apr 26, 2012
Commits on Apr 26, 2012
  1. Start preparing for 1.7.10.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  2. Merge branch 'jk/run-command-eacces' into maint

    When PATH contains an unreadable directory, alias expansion code did
    not kick in, and failed with an error that said "git-subcmd" was not
    found.
    
    By Jeff King (1) and Ramsay Jones (1)
    * jk/run-command-eacces:
      run-command: treat inaccessible directories as ENOENT
      compat/mingw.[ch]: Change return type of exec functions to int
    gitster committed Apr 26, 2012
  3. Merge branch 'jc/push-upstream-sanity' into maint

    The 'push to upstream' implementation was broken in some corner
    cases. "git push $there" without refspec, when the current branch is
    set to push to a remote different from $there, used to push to $there
    using the upstream information to a remote unreleated to $there.
    
    * jc/push-upstream-sanity:
      push: error out when the "upstream" semantics does not make sense
    gitster committed Apr 26, 2012
  4. Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint

    "git clean -d -f" (not "-d -f -f") is supposed to protect nested
    working trees of independent git repositories that exist in the
    current project working tree from getting removed, but the protection
    applied only to such working trees that are at the top-level of the
    current project by mistake.
    
    * jc/maint-clean-nested-worktree-in-subdir:
      clean: preserve nested git worktree in subdirectories
    gitster committed Apr 26, 2012
  5. Merge branch 'jk/diff-no-rename-empty' into maint

    Rename detection logic used to match two empty files as renames during
    merge-recursive, leading unnatural mismerges.
    
    By Jeff King
    * jk/diff-no-rename-empty:
      merge-recursive: don't detect renames of empty files
      teach diffcore-rename to optionally ignore empty content
      make is_empty_blob_sha1 available everywhere
      drop casts from users EMPTY_TREE_SHA1_BIN
    gitster committed Apr 26, 2012
  6. Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint

    An age-old corner case bug in combine diff (only triggered with -U0
    and the hunk at the beginning of the file needs to be shown) has been
    fixed.
    
    By René Scharfe
    * rs/combine-diff-zero-context-at-the-beginning:
      combine-diff: fix loop index underflow
    gitster committed Apr 26, 2012
  7. Merge branch 'jc/commit-unedited-template' into maint

    When "git commit --template F" errors out because the user did not
    touch the message, it claimed that it aborts due to "empty message",
    which was utterly wrong.
    
    By Junio C Hamano (4) and Adam Monsen (1)
    * jc/commit-unedited-template:
      Documentation/git-commit: rephrase the "initial-ness" of templates
      git-commit.txt: clarify -t requires editing message
      commit: rephrase the error when user did not touch templated log message
      commit: do not trigger bogus "has templated message edited" check
      t7501: test the right kind of breakage
    gitster committed Apr 26, 2012
  8. Merge branch 'jk/add-p-skip-conflicts' into maint

    "git add -p" is not designed to deal with unmerged paths but did
    not exclude them and tried to apply funny patches only to fail.
    
    By Jeff King
    * jk/add-p-skip-conflicts:
      add--interactive: ignore unmerged entries in patch mode
    gitster committed Apr 26, 2012
  9. Merge branch 'jc/commit-hook-authorship' into maint

    "git commit --author=$name" did not tell the name that was being
    recorded in the resulting commit to hooks, even though it does do so
    when the end user overrode the authorship via the "GIT_AUTHOR_NAME"
    environment variable.
    
    * jc/commit-hook-authorship:
      commit: pass author/committer info to hooks
      t7503: does pre-commit-hook learn authorship?
      ident.c: add split_ident_line() to parse formatted ident line
    gitster committed Apr 26, 2012
  10. Merge branch 'tr/maint-word-diff-regex-sticky' into maint

    The regexp configured with diff.wordregex was incorrectly reused
    across files.
    
    By Thomas Rast (2) and Johannes Sixt (1)
    * tr/maint-word-diff-regex-sticky:
      diff: tweak a _copy_ of diff_options with word-diff
      diff: refactor the word-diff setup from builtin_diff_cmd
      t4034: diff.*.wordregex should not be "sticky" in --word-diff
    gitster committed Apr 26, 2012
  11. Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint

    Running "notes merge --commit" failed to perform correctly when run
    from any directory inside $GIT_DIR/.  When "notes merge" stops with
    conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
    to resolve it.
    
    By Johan Herland (3) and Junio C Hamano (1)
    * jh/notes-merge-in-git-dir-worktree:
      notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
      notes-merge: use opendir/readdir instead of using read_directory()
      t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
      remove_dir_recursively(): Add flag for skipping removal of toplevel dir
    gitster committed Apr 26, 2012
  12. Sync with 1.7.9.7

    gitster committed Apr 26, 2012
  13. Git 1.7.9.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  14. Sync with 1.7.8.6

    gitster committed Apr 26, 2012
  15. Git 1.7.8.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  16. Sync with 1.7.7.7

    gitster committed Apr 26, 2012
  17. Git 1.7.7.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  18. bundle: remove stray single-quote from error message

    After running rev-list --boundary to retrieve the list of boundary
    commits, "git bundle create" runs its own revision walk.  If in this
    stage git encounters an unfamiliar option, it writes a message with an
    unbalanced quotation mark:
    
    	error: unrecognized argument: --foo'
    
    Drop the stray quote to match the "unrecognized argument: %s" message
    used elsewhere and save translators some work.
    
    This is mostly a futureproofing measure: for now, the "rev-list
    --boundary" command catches most strange arguments on its own and the
    above message is not seen unless you try something esoteric like "git
    bundle create test.bundle --header HEAD".
    
    Reported-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 26, 2012
Commits on Apr 14, 2012
  1. submodules: recursive fetch also checks new tags for submodule commits

    Since 88a2197 (fetch/pull: recurse into submodules when necessary) all
    fetched commits are examined if they contain submodule changes (unless
    configuration or command line options inhibit that). If a newly recorded
    submodule commit is not present in the submodule, a fetch is run inside
    it to download that commit.
    
    Checking new refs was done in an else branch where it wasn't executed for
    tags. This normally isn't a problem because tags are only fetched with
    the branches they live on, then checking the new commits in the fetched
    branches for submodule commits will also process all tags. But when a
    specific tag is fetched (or the refspec contains refs/tags/) commits only
    reachable by tags won't be searched for submodule commits, which is a bug.
    
    Fix that by moving the code outside the if/else construct to handle new
    tags just like any other ref. The performance impact of adding tags that
    most of the time lie on a branch which is checked anyway for new submodule
    commit should be minimal, as since 6859de4 (fetch: avoid quadratic loop
    checking for updated submodules) all ref-tips are collected first and then
    fed to a single rev-list.
    
    Spotted-by: Jeff King <peff@peff.net>
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlehmann committed with gitster Apr 13, 2012
Commits on Apr 12, 2012
Commits on Apr 11, 2012
  1. blame: accept --need-minimal

    Between v1.7.1 and v1.7.2, 582aa00 switched the default "diff"
    invocation not to use XDF_NEED_MINIMAL, but this breaks "git blame"
    rather badly.
    
    Allow the command line option to ask for an extra careful matching.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 11, 2012