Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Update draft release note to 1.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mg/rev-list-n-parents' * mg/rev-list-n-parents: tests: avoid nonportable {foo,bar} glob rev-list --min-parents,--max-parents: doc, test and completion revision.c: introduce --min-parents and --max-parents options t6009: use test_commit() from test-lib.sh
Junio C Hamano
Merge branch 'js/remove-unused-variables' * js/remove-unused-variables: Remove unused variables
Junio C Hamano
Merge branch 'jp/completion-help-alias' * jp/completion-help-alias: git-completion: Add git help completion for aliases
Junio C Hamano
Merge branch 'jc/index-update-if-able' * jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update
Junio C Hamano
Merge branch 'jk/checkout-orphan-warning' * jk/checkout-orphan-warning: checkout: tweak detached-orphan warning format checkout: clear commit marks after detached-orphan check checkout: add basic tests for detached-orphan warning
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir' * jc/maint-rerere-in-workdir: rerere: make sure it works even in a workdir attached to a young repository
Junio C Hamano
Merge branch 'nd/index-doc' * nd/index-doc: doc: technical details about the index file format doc: technical details about the index file format
Junio C Hamano
Merge branch 'jc/fetch-progressive-stride' * jc/fetch-progressive-stride: fetch-pack: use smaller handshake window for initial request fetch-pack: progressively use larger handshake windows fetch-pack: factor out hardcoded handshake window size Conflicts: builtin/fetch-pack.c
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: handle log message with embedded NUL vcs-svn: avoid unnecessary copying of log message and author vcs-svn: remove buffer_read_string vcs-svn: make reading of properties binary-safe
Junio C Hamano
Merge git-gui 0.14.0
Jonathan Nieder
vcs-svn: handle log message with embedded NUL Pass the log message by strbuf instead of as a C-style string and use fwrite instead of printf to write it to fast-import so embedded '\0' bytes can be preserved. Currently "git log" doesn't show the embedded NULs but "git cat-file commit" can. While at it, stop including system headers from repo_tree.h. git source files need to include git-compat-util.h (or cache.h or builtin.h) sooner to ensu…
Jonathan Nieder
vcs-svn: avoid unnecessary copying of log message and author Use strbuf_swap when storing the svn:log and svn:author properties, so pointers to rather than the contents of buffers get copied. The main effect should be to make the code a little easier to read. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Jonathan Nieder
vcs-svn: remove buffer_read_string All previous users of buffer_read_string have already been converted to use the more intuitive buffer_read_binary, so remove the old API to avoid some confusion. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Jonathan Nieder
vcs-svn: make reading of properties binary-safe svn-fe errors out on revision 59151 of the ASF repository: fatal: invalid dump: unexpected end of file The proximate cause is a property with an embedded NUL character. Previously such anomalies were ignored but commit c9d1c8ba (2010-12-28) introduced a check strlen(val) == len to avoid reading uninitialized data when a property list ends early and unfortunately this test does not distinguish b…
Junio C Hamano
Sync with 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4.2
Jeff King
pull: do not clobber untracked files on initial pull For a pull into an unborn branch, we do not use "git merge" at all. Instead, we call read-tree directly. However, we used the --reset parameter instead of "-m", which turns off the safety features. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
merge: merge unborn index before setting ref When we merge into an unborn branch, there are basically two steps: 1. Write the sha1 of the new commit into the ref pointed to by HEAD. 2. Update the index with the new content, and check it out to the working tree. We currently do them in this order. However, (2) is the step that is much more likely to fail, since it can be blocked by things like untracked working tree files. Wh…
Jeff King
t7607: clean up stray untracked file This file ends up conflicting with the test just after it (causing the "git merge" to fail). Neither test is to blame for the bug, though. It looks like the merge in 1a9fe45 (Merge branch 'tr/merge-unborn-clobber', 2011-02-09) is what caused the conflict. We didn't notice because the follow-on test is already marked as expect_failure (even though it has since been fixed, and now succeeds once th…
Jeff King
t7607: mark known breakage in test 11 as fixed This was fixed by 1d718a51 (do not overwrite untracked symlinks, 2011-02-20). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narębski
gitweb: Fix handling of fractional timezones in parse_date Fractional timezones, like -0330 (NST used in Canada) or +0430 (Afghanistan, Iran DST), were not handled properly in parse_date; this means values such as 'minute_local' and 'iso-tz' were not generated correctly. This was caused by two mistakes: * sign of timezone was applied only to hour part of offset, and not as it should be also to minutes part (this affected only negative fractional tim…
Pat Thoyts
Merge branch 'ss/git-gui-mergetool'
Tags
gitgui-0.14.0
Pat Thoyts
git-gui: detect the use of MUI langauge packs on Windows The Tcl msgcat package doesn't detect the use of a multi-lingual language pack on Windows 7. This means that a user may have their display language set to Japanese but the system installed langauge was English. This patch reads the relevent registry key to fix this before loading in the locale specific parts of git-gui. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Jonathan Nieder
tests: avoid nonportable {foo,bar} glob Unlike bash and ksh, dash and busybox ash do not support brace expansion (as in 'echo {hello,world}'). So when dash is sh, t6009.13 (set up dodecapus) ends up pass a string beginning with "root{1,2," to "git merge" verbatim and the test fails. Fix it by introducing a variable to hold the list of parents for the dodecapus and populating it in a more low-tech way. While at it, simplify a little b…
Junio C Hamano
merge: merge with the default upstream branch without argument "git merge" without specifying any commit is a no-op by default. A new option merge.defaultupstream can be set to true to cause such an invocation of the command to merge the upstream branches configured for the current branch by using their last observed values stored in their remote tracking branches. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jared Hance
merge: match the help text with the documentation We used to be very casual in terminology and used <branch>, <ref> and <rev> more or less interchangeably with <commit>. Match the help text given by "git merge -h" with that of the documentation. Signed-off-by: Jared Hance <jaredhance@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
rerere: make sure it works even in a workdir attached to a young repository The git-new-workdir script in contrib/ makes a new work tree by sharing many subdirectories of the .git directory with the original repository. When rerere.enabled is set in the original repository, but the user has not encountered any conflicts yet, the original repository may not yet have .git/rr-cache directory. When rerere wants to run in a new work tree created from such a young original rep…
Junio C Hamano
doc: technical details about the index file format * Clarify "string of unsigned bytes"; * Blob has two variants (regular file vs symlink), not (blob vs symlink); * Clarify permission mode bits; * Clarify ce_namelen() "too long to fit in the length field" case; * Clarify "." etc are forbidden as path components; * Match the description with the internal wording "cache-tree"; * All types of extension begin with signature and length as …
Junio C Hamano
Merge branch 'kc/gitweb-pathinfo-w-anchor' * kc/gitweb-pathinfo-w-anchor: gitweb: fix #patchNN anchors when path_info is enabled
  1. Prev
  2. Next