Permalink
Commits on Sep 18, 2012
  1. Update draft release notes to 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 18, 2012
  2. Merge branch 'jc/maint-log-grep-all-match'

    Fix a long-standing bug in "git log --grep" when multiple "--grep"
    are used together with "--all-match" and "--author" or "--committer".
    
    * jc/maint-log-grep-all-match:
      t7810-grep: test --all-match with multiple --grep and --author options
      t7810-grep: test interaction of multiple --grep and --author options
      t7810-grep: test multiple --author with --all-match
      t7810-grep: test multiple --grep with and without --all-match
      t7810-grep: bring log --grep tests in common form
      grep.c: mark private file-scope symbols as static
      log: document use of multiple commit limiting options
      log --grep/--author: honor --all-match honored for multiple --grep patterns
      grep: show --debug output only once
      grep: teach --debug option to dump the parse tree
    gitster committed Sep 18, 2012
  3. Merge branch 'jc/make-static'

    Turn many file-scope private symbols to static to reduce the
    global namespace contamination.
    
    * jc/make-static:
      sequencer.c: mark a private file-scope symbol as static
      ident.c: mark private file-scope symbols as static
      trace.c: mark a private file-scope symbol as static
      wt-status.c: mark a private file-scope symbol as static
      read-cache.c: mark a private file-scope symbol as static
      strbuf.c: mark a private file-scope symbol as static
      sha1-array.c: mark a private file-scope symbol as static
      symlinks.c: mark private file-scope symbols as static
      notes.c: mark a private file-scope symbol as static
      rerere.c: mark private file-scope symbols as static
      graph.c: mark private file-scope symbols as static
      diff.c: mark a private file-scope symbol as static
      commit.c: mark a file-scope private symbol as static
      builtin/notes.c: mark file-scope private symbols as static
    gitster committed Sep 18, 2012
  4. Merge branch 'pw/p4-submit-conflicts'

    Add '--conflict' option to git-p4 subcommand to specify what action
    to take when conflicts are found during 'p4 submit'.
    
    * pw/p4-submit-conflicts:
      git-p4: add submit --conflict option and config varaiable
      git p4: add submit --prepare-p4-only option
      git p4: add submit --dry-run option
      git p4: accept -v for --verbose
      git p4: revert deleted files after submit cancel
      git p4: rearrange submit template construction
      git p4: test clean-up after failed submit, fix added files
      git p4: standardize submit cancel due to unchanged template
      git p4: move conflict prompt into run, add [q]uit input
      git p4: remove submit failure options [a]pply and [w]rite
      git p4: gracefully fail if some commits could not be applied
      git p4 test: remove bash-ism of combined export/assignment
    gitster committed Sep 18, 2012
  5. Merge branch 'mv/cherry-pick-s'

    After "git cherry-pick -s" gave control back to the user asking
    help to resolve conflicts, concluding "git commit" needs to be run
    with "-s" if the user wants to sign it off, but the command should
    be able to remember that.
    
    * mv/cherry-pick-s:
      cherry-pick: don't forget -s on failure
    gitster committed Sep 18, 2012
  6. Merge branch 'nd/fetch-status-alignment'

    The status report from "git fetch", when messages like 'up-to-date'
    are translated, did not align the branch names well.
    
    * nd/fetch-status-alignment:
      fetch: align per-ref summary report in UTF-8 locales
    gitster committed Sep 18, 2012
  7. Sync with 1.7.12.1

    gitster committed Sep 18, 2012
  8. Git 1.7.12.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 18, 2012
  9. Merge branch 'er/doc-fast-import-done' into maint

    * er/doc-fast-import-done:
      fast-import: document the --done option
    gitster committed Sep 18, 2012
  10. Merge branch 'jk/config-warn-on-inaccessible-paths' into maint

    The attribute system may be asked for a path that itself or its
    leading directories no longer exists in the working tree, and it is
    fine if we cannot open .gitattribute file in such a case.  Failure
    to open per-directory .gitattributes with error status other than
    ENOENT and ENOTDIR should be diagnosed.
    
    * jk/config-warn-on-inaccessible-paths:
      attr: failure to open a .gitattributes file is OK with ENOTDIR
      warn_on_inaccessible(): a helper to warn on inaccessible paths
      attr: warn on inaccessible attribute files
      gitignore: report access errors of exclude files
      config: warn on inaccessible files
    gitster committed Sep 18, 2012
  11. Doc: Improve shallow depth wording

    Avoid confusion in compound sentence about the start of the commit set
    and the depth measure. Use two sentences.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    PhilipOakley committed with gitster Sep 16, 2012
  12. Documentation/git-filter-branch: Move note about effect of removing c…

    …ommits
    
    The note that explains that changes introduced by removed commits are
    preserved should be placed directly after the paragraph that describes
    such commits removal.  Otherwise the reference to "the commits" appears
    out of context.
    
    Also the big example that follows "Consider this history" is about
    rewriting part of the history DAG.  Move the paragraph that
    describes the operation close to it.
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    andreas-schwab committed with gitster Sep 18, 2012
Commits on Sep 17, 2012
  1. The seventh batch for 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 17, 2012
  2. Merge branch 'maint'

    * maint:
      t/perf: add "trash directory" to .gitignore
      Add missing -z to git check-attr usage text for consistency with man page
      git-jump: ignore (custom) prefix in diff mode
      Documentation: indent-with-non-tab uses "equivalent tabs" not 8
      completion: add --no-edit to git-commit
    gitster committed Sep 17, 2012
  3. Merge branch 'mh/fetch-filter-refs'

    Code simplification and clarification.
    
    * mh/fetch-filter-refs:
      test-string-list.c: Fix some sparse warnings
      fetch-pack: eliminate spurious error messages
      cmd_fetch_pack(): simplify computation of return value
      fetch-pack: report missing refs even if no existing refs were received
      cmd_fetch_pack(): return early if finish_connect() fails
      filter_refs(): simplify logic
      filter_refs(): build refs list as we go
      filter_refs(): delete matched refs from sought list
      fetch_pack(): update sought->nr to reflect number of unique entries
      filter_refs(): do not check the same sought_pos twice
      Change fetch_pack() and friends to take string_list arguments
      fetch_pack(): reindent function decl and defn
      Rename static function fetch_pack() to http_fetch_pack()
      t5500: add tests of fetch-pack --all --depth=N $URL $REF
      t5500: add tests of error output for missing refs
    gitster committed Sep 17, 2012
  4. Merge branch 'nd/maint-diffstat-summary'

    Earlier we made the diffstat summary line that shows the number of
    lines added/deleted localizable, but it was found irritating having
    to see them in various languages on a list whose discussion language
    is English.
    
    The original had trivial thinko in reverting Q_(), which has been
    fixed.
    
    * nd/maint-diffstat-summary:
      Revert diffstat back to English
    gitster committed Sep 17, 2012
  5. Merge branch 'jk/config-warn-on-inaccessible-paths'

    The attribute system may be asked for a path that itself or its
    leading directories no longer exists in the working tree.  Failure
    to open per-directory .gitattributes with error status other than
    ENOENT and ENOTDIR are diagnosed.
    
    * jk/config-warn-on-inaccessible-paths:
      attr: failure to open a .gitattributes file is OK with ENOTDIR
    gitster committed Sep 17, 2012
  6. Merge branch 'jw/doc-commit-title'

    Update parts of document that talked about "first line of commit
    log" to say "title of commit" with definition of what that "title"
    is.
    
    * jw/doc-commit-title:
      Documentation: describe subject more precisely
    gitster committed Sep 17, 2012
  7. Merge branch 'mh/string-list'

    * mh/string-list:
      api-string-list.txt: initialize the string_list the easy way
      string_list: add a function string_list_longest_prefix()
      string_list: add a new function, string_list_remove_duplicates()
      string_list: add a new function, filter_string_list()
      string_list: add two new functions for splitting strings
      string_list: add function string_list_append_nodup()
    gitster committed Sep 17, 2012
  8. Merge branch 'jc/maint-blame-no-such-path'

    "git blame MAKEFILE" run in a history that has "Makefile" but not
    "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
    confused on a case insensitive filesystem and failed to do so.
    
    Even during a conflicted merge, "git blame $path" always meant to
    blame uncommitted changes to the "working tree" version; make it
    more useful by showing cleanly merged parts as coming from the other
    branch that is being merged.
    
    * jc/maint-blame-no-such-path:
      blame: allow "blame file" in the middle of a conflicted merge
      blame $path: avoid getting fooled by case insensitive filesystems
    gitster committed Sep 17, 2012
  9. t/perf: add "trash directory" to .gitignore

    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Sep 17, 2012
  10. Add missing -z to git check-attr usage text for consistency with man …

    …page
    
    Signed-off-by: Adam Spiers <git@adamspiers.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    aspiers committed with gitster Sep 17, 2012
  11. git-jump: ignore (custom) prefix in diff mode

    Matching the default file prefix b/ does not yield any results if config
    option diff.noprefix or diff.mnemonicprefix is enabled.
    
    Signed-off-by: Mischa POSLAWSKY <git@shiar.nl>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Mischa POSLAWSKY committed with gitster Sep 17, 2012
  12. Documentation: indent-with-non-tab uses "equivalent tabs" not 8

    Update the documentation of the core.whitespace option
    "indent-with-non-tab" to correctly reflect that it catches the use of
    spaces instead of the equivalent tabs, rather than a fixed number.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wjl committed with gitster Sep 17, 2012
  13. completion: add --no-edit to git-commit

    Signed-off-by: Yacine Belkadi <yacine.belkadi.1@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ybelkadi committed with gitster Sep 16, 2012
  14. git-p4: add submit --conflict option and config varaiable

    This allows specifying what to do when a conflict
    happens when applying a commit to p4, automating the
    interactive prompt.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  15. git p4: add submit --prepare-p4-only option

    This option can be used to prepare the client workspace for
    submission, only.  It does not invoke the final "p4 submit".
    A message describes how to proceed, either submitting the
    changes or reverting.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  16. git p4: add submit --dry-run option

    A new option, "git p4 submit --dry-run" can be used to verify
    what commits and labels would be moved into p4.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  17. git p4: accept -v for --verbose

    The short form "-v" is common in many git commands as an
    alias for "--verbose".
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  18. git p4: revert deleted files after submit cancel

    The user can decide not to continue with a submission,
    by not saving the p4 submit template, then answering "no" to
    the "Submit anyway?" prompt.  In this case, be sure to
    return the p4 client to its initial state.
    
    Deleted files were not reverted; fix this and test all cases.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  19. git p4: rearrange submit template construction

    Put all items in order as they appear, and add comments.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  20. git p4: test clean-up after failed submit, fix added files

    Test a variety of cases where a patch failed to apply to
    p4 and had to be cleaned up.
    
    If the patch failed to apply cleanly, do not try to remove
    to-be-added files, as they have not really been added yet.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  21. git p4: standardize submit cancel due to unchanged template

    When editing the submit template, if no change was made to it,
    git p4 offers a prompt "Submit anyway?".  Answering "no" cancels
    the submit.
    
    Previously, a "no" answer behaves like a "[s]kip" answer to the
    failed-patch prompt, in that it proceeded to try to apply the
    rest of the commits.  Instead, put users back into the new
    "[s]kip / [c]ontinue" loop so that they can decide.  This makes
    both cases of patch failure behave identically.
    
    The return code of git p4 after a "no" answer is now the same
    as that for a "skip" due to failed patch; update a test to
    understand this.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  22. git p4: move conflict prompt into run, add [q]uit input

    When applying a commit to the p4 workspace fails, a prompt
    asks what to do next.  This belongs up in run() instead
    of in applyCommit(), where run() can notice, for instance,
    that the prompt is unnecessary because this is the last commit.
    
    Offer two options about how to continue at conflict: [s]kip or
    [q]uit.  Having an explicit "quit" option gives git p4 a chance
    to clean up, show the applied-commit summary, and do tag export.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012
  23. git p4: remove submit failure options [a]pply and [w]rite

    When a patch failed to apply, these interactive options offered
    to:
    
        1) apply the patch anyway, leaving reject (.rej) files around, or,
        2) write the patch to a file (patch.txt)
    
    In both cases it suggested to invoke "git p4 submit --continue",
    an unimplemented option.
    
    While manually fixing the rejects and submitting the result might
    work, there are many steps that must be done to the job properly:
    
        * apply patch
        * invoke p4 add and delete
        * change executable bits
        * p4 sync -f renamed/copied files
        * extract commit message into p4 change description and
          move Jobs lines out of description section
        * set changelist owner for --preserve-user
    
    Plus the following manual sync/rebase will cause conflicts too,
    which must be resolved once again.
    
    Drop these workflows.  Instead users should do a sync/rebase in
    git, fix the conflicts there, and do a clean "git p4 submit".
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Luke Diamand <luke@diamand.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Sep 9, 2012