Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'jn/fortify-source-workaround' * jn/fortify-source-workaround: run-command: prettify -D_FORTIFY_SOURCE workaround
Junio C Hamano
Merge branch 'jn/maint-c99-format' * jn/maint-c99-format: unbreak and eliminate NO_C99_FORMAT mktag: avoid %td in format string
Junio C Hamano
Merge branch 'lt/default-abbrev' * lt/default-abbrev: Rename core.abbrevlength back to core.abbrev Make the default abbrev length configurable
Junio C Hamano
Merge branch 'pk/stash-apply-status-relative' * pk/stash-apply-status-relative: Add test: git stash shows status relative to current dir git stash: show status relative to current directory
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' * jc/maint-diff-q-filter: diff --quiet: disable optimization when --diff-filter=X is used
Junio C Hamano
Merge branch 'pw/p4' * pw/p4: git-p4: test sync new branch git-p4: fix sync new branch regression
Michael J Gruber
rev-list --min-parents,--max-parents: doc, test and completion This also adds test for "--merges" and "--no-merges" which we did not have so far. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
revision.c: introduce --min-parents and --max-parents options Introduce --min-parents and --max-parents options which limit the revisions to those commits which have at least (or at most) that many commits, where negative arguments for --max-parents= denote infinity (i.e. no upper limit). In particular: --max-parents=1 is the same as --no-merges; --min-parents=2 is the same as --merges; --max-parents=0 shows only roots; and --min-parents=3 shows on…
Junio C Hamano
Update draft release notes to 1.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mg/rev-list-one-side-only' * mg/rev-list-one-side-only: git-log: put space after commit mark t6007: test rev-list --cherry log --cherry: a synonym rev-list: documentation and test for --cherry-mark revision.c: introduce --cherry-mark rev-list/log: factor out revision mark generation rev-list: --left/right-only are mutually exclusive rev-list: documentation and test for --left/right-only t6007: Make sure we…
Junio C Hamano
Merge branch 'js/maint-stash-index-copy' * js/maint-stash-index-copy: stash: copy the index using --index-output instead of cp -p stash: fix incorrect quoting in cleanup of temporary files
Junio C Hamano
Merge branch 'tl/p4' * tl/p4: git-p4: Fix error message crash in P4Sync.commit. Teach git-p4 to ignore case in perforce filenames if configured. git-p4: Teach gitConfig method about arguments.
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' * mg/doc-bisect-tweak-worktree: git-bisect.txt: example for bisecting with hot-fix git-bisect.txt: streamline run presentation
Junio C Hamano
Merge branch 'jn/test-sanitize-git-env' * jn/test-sanitize-git-env: tests: scrub environment of GIT_* variables config: drop support for GIT_CONFIG_NOGLOBAL gitattributes: drop support for GIT_ATTR_NOGLOBAL tests: suppress system gitattributes tests: stop worrying about obsolete environment variables
Junio C Hamano
Merge branch 'sp/maint-upload-pack-stop-early' * sp/maint-upload-pack-stop-early: upload-pack: Implement no-done capability upload-pack: More aggressively send 'ACK %s ready'
Junio C Hamano
Merge branch 'sp/maint-fetch-pack-stop-early' * sp/maint-fetch-pack-stop-early: fetch-pack: Implement no-done capability fetch-pack: Finish negotation if remote replies "ACK %s ready"
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' * jc/maint-rev-list-culled-boundary: list-objects.c: don't add an unparsed NULL as a pending tree Conflicts: list-objects.c
Junio C Hamano
Merge branch 'jc/maint-fetch-alt' * jc/maint-fetch-alt: fetch-pack: objects in our alternates are available to us refs_from_alternate: helper to use refs from alternates Conflicts: builtin/receive-pack.c
Junio C Hamano
Merge branch 'sg/complete-symmetric-diff' * sg/complete-symmetric-diff: bash: complete 'git diff ...branc<TAB>' bash: fix misindented esac statement in __git_complete_file()
Junio C Hamano
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn * 'svn-fe' of git://repo.or.cz/git/jrn: vcs-svn: use strchr to find RFC822 delimiter vcs-svn: implement perfect hash for top-level keys vcs-svn: implement perfect hash for node-prop keys vcs-svn: use strbuf for author, UUID, and URL vcs-svn: use strbuf for revision log vcs-svn: improve reporting of input errors vcs-svn: make buffer_copy_bytes return length read vcs-svn: make buffer…
Jonathan Nieder
Merge branch 'db/length-as-hash' into svn-fe * db/length-as-hash: vcs-svn: use strchr to find RFC822 delimiter vcs-svn: implement perfect hash for top-level keys vcs-svn: implement perfect hash for node-prop keys Conflicts: vcs-svn/svndump.c
David Barr
vcs-svn: use strchr to find RFC822 delimiter This is a small optimisation (4% reduction in user time) but is the largest artifact within the parsing portion of svndump.c Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
David Barr
vcs-svn: implement perfect hash for top-level keys Instead of interning property names and comparing their string_pool keys, look them up in a table by string length, which should be about as fast. Another small step towards removing dependence on string_pool altogether. Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
David Barr
vcs-svn: implement perfect hash for node-prop keys Instead of interning property names and comparing their string_pool keys, look them up in a table by string length, which should be about as fast. This is a small step towards removing dependence on string_pool. Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
David Barr
vcs-svn: use strbuf for author, UUID, and URL Use strbufs and strings instead of interned strings for values of rev, dump, and node fields that happen to be strings. After this change, the only remaining string_pool use is for paths in the repo_tree API and internals. Functional change: treat an empty author, UUID, or URL as none at all. So for example, in repos where the first revision has an empty svn:author property, the first rev will b…
Junio C Hamano
Merge branch 'maint' * maint: git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' bisect: visualize with git-log if gitk is unavailable
David Barr
vcs-svn: use strbuf for revision log obj_pool is overkill for this application: all that is needed is a buffer that can resize from rev to rev to accomodate differently-sized strings. In the spirit of commit deadcef4 (2010-11-06), use a strbuf instead. This is a small step towards removing dependence on obj_pool.h. Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Jonathan Nieder
vcs-svn: improve reporting of input errors Catch input errors and exit early enough to print a reasonable diagnosis based on errno. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Jonathan Nieder
vcs-svn: make buffer_copy_bytes return length read Currently buffer_copy_bytes does not report to its caller whether it encountered an early end of file. Add a return value representing the number of bytes read (but not the number of bytes copied). This way all three unusual conditions can be distinguished: input error with buffer_ferror, output error with ferror(outfile), early end of input by checking the return value. Signed-off-by: Jonathan…
Jonathan Nieder
vcs-svn: make buffer_skip_bytes return length read Currently there is no way to detect when input ended if it ended early during buffer_skip_bytes. Tell the calling program how many bytes were actually skipped for easier debugging. Existing callers will still ignore early EOF. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  1. Prev
  2. Next