Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 25, 2013
  1. @gitster

    Merge branch 'for-junio' of git://bogomips.org/git-svn

    gitster authored
    * 'for-junio' of git://bogomips.org/git-svn:
      git-svn: Simplify calculation of GIT_DIR
      git-svn: cleanup sprintf usage for uppercasing hex
  2. @gitster

    Update draft release notes to 1.8.2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'nd/retire-fnmatch'

    gitster authored
    Replace our use of fnmatch(3) with a more feature-rich wildmatch.
    A handful patches at the bottom have been moved to nd/wildmatch to
    graduate as part of that branch, before this series solidifies.
    
    We may want to mark USE_WILDMATCH as an experimental curiosity a
    bit more clearly (i.e. should not be enabled in production
    environment, because it will make the behaviour between builds
    unpredictable).
    
    * nd/retire-fnmatch:
      Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
      wildmatch: advance faster in <asterisk> + <literal> patterns
      wildmatch: make a special case for "*/" with FNM_PATHNAME
      test-wildmatch: add "perf" command to compare wildmatch and fnmatch
      wildmatch: support "no FNM_PATHNAME" mode
      wildmatch: make dowild() take arbitrary flags
      wildmatch: rename constants and update prototype
  4. @gitster

    Merge branch 'jc/doc-maintainer'

    gitster authored
    Describe tools for automation that were invented since this
    document was originally written.
    
    * jc/doc-maintainer:
      howto/maintain: document "### match next" convention in jch/pu branch
      howto/maintain: mark titles for asciidoc
      Documentation: update "howto maintain git"
  5. @gitster

    howto/maintain: document "### match next" convention in jch/pu branch

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 24, 2013
  1. @barrywardell

    git-svn: Simplify calculation of GIT_DIR

    barrywardell authored Eric Wong committed
    Since git-rev-parse already checks for the $GIT_DIR environment
    variable and that it returns an actual git repository, there is no
    need to repeat the checks again here.
    
    This also fixes a problem where git-svn did not work in cases where
    .git was a file with a gitdir: link.
    
    [ew: squashed test case,
     delay setting GIT_DIR until after `git rev-parse --cdup` to fix t9101,
     (thanks to Junio)]
    
    Signed-off-by: Barry Wardell <barry.wardell@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  2. git-svn: cleanup sprintf usage for uppercasing hex

    Eric Wong authored
    We do not need to call uc() separately for sprintf("%x")
    as sprintf("%X") is available.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
  3. @gitster

    Merge branch 'as/pre-push-hook'

    gitster authored
    Add an extra hook so that "git push" that is run without making
    sure what is being pushed is sane can be checked and rejected (as
    opposed to the user deciding not pushing).
    
    * as/pre-push-hook:
      Add sample pre-push hook script
      push: Add support for pre-push hooks
      hooks: Add function to check if a hook exists
  4. @gitster

    Merge branch 'ch/add-auto-submitted-in-sample-post-receive-email'

    gitster authored
    * ch/add-auto-submitted-in-sample-post-receive-email:
      Add Auto-Submitted header to post-receive-email
  5. @gitster

    Merge branch 'as/check-ignore'

    gitster authored
    Add a new command "git check-ignore" for debugging .gitignore
    files.
    
    The variable names may want to get cleaned up but that can be done
    in-tree.
    
    * as/check-ignore:
      clean.c, ls-files.c: respect encapsulation of exclude_list_groups
      t0008: avoid brace expansion
      add git-check-ignore sub-command
      setup.c: document get_pathspec()
      add.c: extract new die_if_path_beyond_symlink() for reuse
      add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
      pathspec.c: rename newly public functions for clarity
      add.c: move pathspec matchers into new pathspec.c for reuse
      add.c: remove unused argument from validate_pathspec()
      dir.c: improve docs for match_pathspec() and match_pathspec_depth()
      dir.c: provide clear_directory() for reclaiming dir_struct memory
      dir.c: keep track of where patterns came from
      dir.c: use a single struct exclude_list per source of excludes
    
    Conflicts:
    	builtin/ls-files.c
    	dir.c
  6. @gitster

    Merge branch 'rs/clarify-entry-cmp-sslice'

    gitster authored
    * rs/clarify-entry-cmp-sslice:
      refs: use strncmp() instead of strlen() and memcmp()
  7. @gitster

    Merge branch 'jk/suppress-clang-warning'

    gitster authored
    * jk/suppress-clang-warning:
      fix clang -Wunused-value warnings for error functions
  8. @gitster

    Merge branch 'cr/push-force-tag-update'

    gitster authored
    Regression fix to stop "git push" complaining "target ref already
    exists", when it is not the real reason the command rejected the
    request (e.g. non-fast-forward).
    
    * cr/push-force-tag-update:
      push: fix "refs/tags/ hierarchy cannot be updated without --force"
  9. @gitster

    Merge branch 'mh/imap-send-shrinkage'

    gitster authored
    Remove a lot of unused code from "git imap-send".
    
    * mh/imap-send-shrinkage:
      imap-send.c: simplify logic in lf_to_crlf()
      imap-send.c: fold struct store into struct imap_store
      imap-send.c: remove unused field imap_store::uidvalidity
      imap-send.c: use struct imap_store instead of struct store
      imap-send.c: remove unused field imap_store::trashnc
      imap-send.c: remove namespace fields from struct imap
      imap-send.c: remove struct imap argument to parse_imap_list_l()
      imap-send.c: inline parse_imap_list() in parse_list()
      imap-send.c: remove some unused fields from struct store
      imap-send.c: remove struct message
      imap-send.c: remove struct store_conf
      iamp-send.c: remove unused struct imap_store_conf
      imap-send.c: remove struct msg_data
      imap-send.c: remove msg_data::flags, which was always zero
  10. @gitster

    Merge branch 'mo/cvs-server-updates'

    gitster authored
    Various git-cvsserver updates.
    
    * mo/cvs-server-updates:
      t9402: Use TABs for indentation
      t9402: Rename check.cvsCount and check.list
      t9402: Simplify git ls-tree
      t9402: Add missing &&; Code style
      t9402: No space after IO-redirection
      t9402: Dont use test_must_fail cvs
      t9402: improve check_end_tree() and check_end_full_tree()
      t9402: sed -i is not portable
      cvsserver Documentation: new cvs ... -r support
      cvsserver: add t9402 to test branch and tag refs
      cvsserver: support -r and sticky tags for most operations
      cvsserver: Add version awareness to argsfromdir
      cvsserver: generalize getmeta() to recognize commit refs
      cvsserver: implement req_Sticky and related utilities
      cvsserver: add misc commit lookup, file meta data, and file listing functions
      cvsserver: define a tag name character escape mechanism
      cvsserver: cleanup extra slashes in filename arguments
      cvsserver: factor out git-log parsing logic
  11. @gitster

    Merge branch 'jc/makefile-perl-python-path-doc'

    gitster authored
    * 'jc/makefile-perl-python-path-doc':
      Makefile: add description on PERL/PYTHON_PATH
Commits on Jan 23, 2013
  1. @gitster

    Merge git://ozlabs.org/~paulus/gitk

    gitster authored
    * git://ozlabs.org/~paulus/gitk:
      gitk: Display important heads even when there are many
      gitk: Improve display of list of nearby tags and heads
      gitk: Fix display of branch names on some commits
      gitk: Update Swedish translation (296t)
      gitk: When searching, only highlight files when in Patch mode
      gitk: Fix error message when clicking on a connecting line
      gitk: Fix crash when not using themed widgets
      gitk: Use bindshiftfunctionkey to bind Shift-F5
      gitk: Refactor code for binding modified function keys
      gitk: Work around empty back and forward images when buttons are disabled
      gitk: Highlight first search result immediately on incremental search
      gitk: Highlight current search hit in orange
      gitk: Synchronize highlighting in file view when scrolling diff
Commits on Jan 22, 2013
  1. @gitster

    Merge branch 'jc/merge-blobs'

    gitster authored
    * jc/merge-blobs:
      Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
  2. @gitster

    Makefile: Replace merge-file.h with merge-blobs.h in LIB_H

    Ramsay Jones authored gitster committed
    Commit fa2364e ("Which merge_file() function do you mean?", 06-12-2012)
    renamed the files merge-file.[ch] to merge-blobs.[ch], but forgot to
    rename the header file in the definition of the LIB_H macro.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Update draft release notes to 1.8.2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'mz/reset-misc'

    gitster authored
    Various 'reset' optimizations and clean-ups, followed by a change
    to allow "git reset" to work even on an unborn branch.
    
    * mz/reset-misc:
      reset: update documentation to require only tree-ish with paths
      reset [--mixed]: use diff-based reset whether or not pathspec was given
      reset: allow reset on unborn branch
      reset $sha1 $pathspec: require $sha1 only to be treeish
      reset.c: inline update_index_refresh()
      reset.c: finish entire cmd_reset() whether or not pathspec is given
      reset [--mixed]: only write index file once
      reset.c: move lock, write and commit out of update_index_refresh()
      reset.c: move update_index_refresh() call out of read_from_tree()
      reset.c: replace switch by if-else
      reset: avoid redundant error message
      reset --keep: only write index file once
      reset.c: share call to die_if_unmerged_cache()
      reset.c: extract function for updating {ORIG_,}HEAD
      reset.c: remove unnecessary variable 'i'
      reset.c: extract function for parsing arguments
      reset: don't allow "git reset -- $pathspec" in bare repo
      reset.c: pass pathspec around instead of (prefix, argv) pair
      reset $pathspec: exit with code 0 if successful
      reset $pathspec: no need to discard index
  5. @gitster

    Merge branch 'nd/fix-directory-attrs-off-by-one'

    gitster authored
    Fix performance regression introduced by an earlier change to let
    attributes apply to directories.
    
    Needs to be merged to maint, as 94bc671 was merged there already.
    
    * nd/fix-directory-attrs-off-by-one:
      attr: avoid calling find_basename() twice per path
      attr: fix off-by-one directory component length calculation
  6. @gitster

    Merge branch 'pw/p4-branch-fixes'

    gitster authored
    Fix "git p4" around branch handling.
    
    * pw/p4-branch-fixes:
      git p4: fix submit when no master branch
      git p4 test: keep P4CLIENT changes inside subshells
      git p4: fix sync --branch when no master branch
      git p4: fail gracefully on sync with no master branch
      git p4: rearrange self.initialParent use
      git p4: allow short ref names to --branch
      git p4 doc: fix branch detection example
      git p4: clone --branch should checkout master
      git p4: verify expected refs in clone --bare test
      git p4: create p4/HEAD on initial clone
      git p4: inline listExistingP4GitBranches
      git p4: add comments to p4BranchesInGit
      git p4: rearrange and simplify hasOrigin handling
      git p4: test sync/clone --branch behavior
  7. @gitster

    Merge branch 'mh/remote-hg-mode-bits-fix'

    gitster authored
    Update to the Hg remote helper (in contrib/).
    
    * mh/remote-hg-mode-bits-fix:
      remote-hg: fix handling of file perms when pushing
  8. @gitster

    Merge branch 'fc/remote-hg-fixup-url'

    gitster authored
    Update to the Hg remote helper (in contrib/).
    
    * fc/remote-hg-fixup-url:
      remote-hg: store converted URL
  9. @gitster

    Merge branch 'zk/clean-report-failure'

    gitster authored
    "git clean" states what it is going to remove and then goes on to
    remove it, but sometimes it only discovers things that cannot be
    removed after recursing into a directory, which makes the output
    confusing and even wrong.
    
    * zk/clean-report-failure:
      git-clean: Display more accurate delete messages
  10. @gitster

    Merge branch 'ph/rebase-preserve-all-merges'

    gitster authored
    An earlier change to add --keep-empty option broke "git rebase
    --preserve-merges" and lost merge commits that end up being the
    same as its parent.
    
    * ph/rebase-preserve-all-merges:
      rebase --preserve-merges: keep all merge commits including empty ones
  11. @gitster

    Merge branch 'nd/clone-no-separate-git-dir-with-bare'

    gitster authored
    Forbid a useless combination of options to "git clone".
    
    * nd/clone-no-separate-git-dir-with-bare:
      clone: forbid --bare --separate-git-dir <dir>
  12. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      git-for-each-ref.txt: 'raw' is a supported date format
  13. @johnkeeping @gitster

    git-for-each-ref.txt: 'raw' is a supported date format

    johnkeeping authored gitster committed
    Commit 7dff9b3 (Support 'raw' date format) added a raw date format.
    Update the git-for-each-ref documentation to include this.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 21, 2013
  1. @gitster

    Update draft release notes to 1.8.2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster authored
  3. @gitster

    Start preparing for 1.8.1.2

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'nz/send-email-headers-are-case-insensitive' into maint

    gitster authored
    When users spell "cc:" in lowercase in the fake "header" in the
    trailer part, "git send-email" failed to pick up the addresses from
    there. As e-mail headers field names are case insensitive, this
    script should follow suit and treat "cc:" and "Cc:" the same way.
    
    * nz/send-email-headers-are-case-insensitive:
      git-send-email: treat field names as case-insensitively
  5. @gitster

    Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint

    gitster authored
    "git archive" did not record uncompressed size in the header when
    streaming a zip archive, which confused some implementations of
    unzip.
    
    * rs/zip-with-uncompressed-size-in-the-header:
      archive-zip: write uncompressed size into header even with streaming
Something went wrong with that request. Please try again.