debian/0000775000000000000000000000000013376766203007205 5ustar debian/git-daemon.init0000664000000000000000000000711712312147625012112 0ustar #!/bin/sh ### BEGIN INIT INFO # Provides: git-daemon # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: git-daemon service # Description: git-daemon is a simple server for git repositories, # ideally suited for read-only updates, i.e. pulling from # git repositories through the network. ### END INIT INFO # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/git-core DESC="git-daemon service" NAME=git-daemon DAEMON=/usr/lib/git-core/$NAME PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME # Exit if the package is not installed [ -e /usr/share/git-core/sysvinit/sentinel ] || exit 0 # Read configuration variable file if it is present [ -r /etc/default/$NAME ] && . /etc/default/$NAME GIT_DAEMON_USER=${GIT_DAEMON_USER:-gitdaemon} GIT_DAEMON_BASE_PATH=${GIT_DAEMON_BASE_PATH:-/var/lib} GIT_DAEMON_DIRECTORY=${GIT_DAEMON_DIRECTORY:-/var/lib/git} DAEMON_ARGS="--user=$GIT_DAEMON_USER --pid-file=$PIDFILE --detach" DAEMON_ARGS="$DAEMON_ARGS --reuseaddr --verbose $GIT_DAEMON_OPTIONS" DAEMON_ARGS="$DAEMON_ARGS --base-path=$GIT_DAEMON_BASE_PATH $GIT_DAEMON_DIRECTORY" # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. . /lib/lsb/init-functions # # Function that starts the daemon/service # do_start() { # Return # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ $DAEMON_ARGS \ || return 2 } # # Function that stops the daemon/service # do_stop() { # Return # 0 if daemon has been stopped # 1 if daemon was already stopped # 2 if daemon could not be stopped # other if a failure occurred start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE return "$RETVAL" } case "$1" in start) if [ $GIT_DAEMON_ENABLE = true ]; then [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" else [ "$VERBOSE" != no ] && log_warning_msg "$NAME not enabled in /etc/default/$NAME, not starting..." exit 0 fi do_start case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; stop) [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" do_stop case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; status) status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? ;; restart|force-reload) if [ $GIT_DAEMON_ENABLE != true ]; then [ "$VERBOSE" != no ] && log_warning_msg "$NAME not enabled in /etc/default/$NAME, stopping..." do_stop case "$?" in 0|1) log_end_msg 0 ;; *) log_end_msg 1 ;; esac exit fi log_daemon_msg "Restarting $DESC" "$NAME" do_stop case "$?" in 0|1) do_start case "$?" in 0) log_end_msg 0 ;; 1) log_end_msg 1 ;; # Old process is still running *) log_end_msg 1 ;; # Failed to start esac ;; *) # Failed to stop log_end_msg 1 ;; esac ;; *) echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 exit 3 ;; esac : debian/git-doc.doc-base.git-pack-format0000664000000000000000000000047012312147625015105 0ustar Document: git-pack-format Title: Git pack format and packing heuristics Author: Jon Loeliger, Junio C Hamano, and the git list Abstract: Git's packed data format. Section: File Management Format: Text Files: /usr/share/doc/git-doc/technical/pack-format.txt /usr/share/doc/git-doc/technical/pack-heuristics.txt debian/gitweb.README.Debian0000664000000000000000000000147512312147625012523 0ustar gitweb for Debian ----------------- The gitweb CGI by default looks into the directory /var/lib/git/ for browsable repositories (this is configured in /etc/gitweb.conf). It expects the repositories' .git subdirectories in /var/lib/git/, symlinks pointing to the corresponding subdirectories in the repositories are just fine, e.g.: ln -s ~pape/git/foo/.git /var/lib/git/foo.git On systems with an Apache webserver, gitweb is automatically made available at http://localhost/gitweb. You can deactivate it by commenting out the first line of /etc/apache2/conf.d/gitweb. For more details about setting up gitweb for a git.example.org server, and on how to make the git core tools such as 'git clone' work through http, see /usr/share/doc/git/README.Debian. -- Gerrit Pape Fri, 15 Sep 2006 09:19:37 +0000 debian/git-core.preinst0000775000000000000000000000021612312147625012314 0ustar #!/bin/sh set -e test -z "$2" || dpkg --compare-versions "$2" gt '1:1.5.2~rc3-2' || exec update-alternatives --remove git /usr/bin/git-scm debian/implicit0000664000000000000000000001023612312147625010732 0ustar .PHONY: deb-checkdir deb-checkuid deb-checkdir: @test -e debian/control || sh -cx '! : wrong directory' deb-checkuid: @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' %.deb: %.deb-share %.deb-DEBIAN : $*.deb ok %.udeb: %.deb-DEBIAN : $*.udeb ok %.deb-checkdir: %.install @test -d debian/$* || sh -cx '! : directory debian/$* missing' @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' %.deb-docs-base: %.install : implicit @rm -f debian/$*/usr/share/doc/$*/* || : @install -d -m0755 debian/$*/usr/share/doc/$* : debian/$*/usr/share/doc/$*/ @sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/' @sh -cx 'install -m0644 debian/changelog \ debian/$*/usr/share/doc/$*/changelog.Debian' @test ! -r changelog || \ sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/' @test ! -r debian/changelog.upstream || \ sh -cx "install -m0644 debian/changelog.upstream \ debian/$*/usr/share/doc/$*/changelog" @test -r debian/$*/usr/share/doc/$*/changelog || \ sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \ debian/$*/usr/share/doc/$*/changelog' @test -s debian/$*/usr/share/doc/$*/changelog || \ sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog' @gzip -9 debian/$*/usr/share/doc/$*/changelog* %.deb-docs-docs: %.deb-docs-base @for i in `cat debian/$*.docs 2>/dev/null || :`; do \ if test -d $$i; then \ sh -cx "install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}" && \ for j in $$i/*; do \ sh -cx "install -m0644 $$j \ debian/$*/usr/share/doc/$*/$${i##*/}/" || exit 1; \ done || exit 1; \ continue; \ fi; \ sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/" || exit 1; \ done @for i in `ls -d debian/$*.README.* 2>/dev/null || :`; do \ sh -cx "install -m0644 $$i \ debian/$*/usr/share/doc/$*/$${i#debian/$*.}" || exit 1; \ done @if test -r debian/$*.NEWS.Debian; then \ sh -cx 'install -m0644 debian/$*.NEWS.Debian \ debian/$*/usr/share/doc/$*/NEWS.Debian && \ gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \ fi %.deb-docs-examples: %.deb-docs-docs @rm -rf debian/$*/usr/share/doc/$*/examples : debian/$*/usr/share/doc/$*/examples/ @test ! -r debian/$*.examples || \ install -d -m0755 debian/$*/usr/share/doc/$*/examples @for i in `cat debian/$*.examples 2>/dev/null || :`; do \ sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/examples/" \ || exit 1; \ done %.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples : debian/$*/usr/share/doc/$*/ ok %.deb-lintian: %.deb-checkdir : debian/$*/usr/share/lintian/overrides @test ! -r debian/$*.lintian-overrides || \ install -d -m0755 debian/$*/usr/share/lintian/overrides @test ! -r debian/$*.lintian-overrides || \ sh -cx "install -m0644 debian/$*.lintian-overrides \ debian/$*/usr/share/lintian/overrides/$*" %.deb-doc-base: %.deb-checkdir : debian/$*/usr/share/doc-base @! ls -d debian/$*.doc-base.* || \ install -d -m0755 debian/$*/usr/share/doc-base @for i in `ls -d debian/$*.doc-base.* 2>/dev/null || :`; do \ sh -cx "install -m0644 $$i \ debian/$*/usr/share/doc-base/$${i#debian/$*.doc-base.}" || exit 1; \ done %.deb-share: %.deb-docs %.deb-lintian %.deb-doc-base : debian/$*/usr/share/doc,doc-base,lintian ok %.deb-DEBIAN-base: %.install @rm -rf debian/$*/DEBIAN : debian/$*/DEBIAN/ @install -d -m0755 debian/$*/DEBIAN @for i in conffiles shlibs templates; do \ test ! -r debian/$*.$$i || \ sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \ || exit 1; \ done %.deb-DEBIAN-scripts: %.deb-DEBIAN-base @for i in preinst prerm postinst postrm config; do \ test ! -r debian/$*.$$i || \ sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \ || exit 1; \ done %.deb-DEBIAN-md5sums: %.deb-DEBIAN-base %.deb-share : debian/$*/DEBIAN/md5sums @rm -f debian/$*/DEBIAN/md5sums @cd debian/$* && find * -path 'DEBIAN' -prune -o \ -type f -exec md5sum {} >>DEBIAN/md5sums \; @chmod 0644 debian/$*/DEBIAN/md5sums @test -s debian/$*/DEBIAN/md5sums || \ rm -f debian/$*/DEBIAN/md5sums %.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \ %.deb-DEBIAN-md5sums : debian/$*/DEBIAN/ ok debian/changelog.upstream.sh0000775000000000000000000000064412312147625013324 0ustar #!/bin/sh set -e : >debian/changelog.upstream exec debian/changelog.upstream."$new" echo "Version $new; changes since $old:" echo "Version $new; changes since $old:" |tr '[:print:]' - echo git shortlog --no-merges "$old".."$new" echo cat debian/changelog.upstream mv debian/changelog.upstream."$new" debian/changelog.upstream old="$new" done debian/git.README.emacs0000664000000000000000000000241612312147625011727 0ustar The git-el package provides various modules for Emacs support. When the git-el package is installed, the modules will be automatically made available to installed Emacs versions. The configuration can be overridden in /etc/emacs/site-start.d/50git-core.el. The following modules are available: * git.el: Status manager that displays the state of all the files of the project, and provides easy access to the most frequently used git commands. The user interface is as far as possible compatible with the pcl-cvs mode. It can be started with `M-x git-status'. * git-blame.el: Emacs implementation of incremental git-blame. When you turn it on while viewing a file, the editor buffer will be updated by setting the background of individual lines to a color that reflects which commit it comes from. * vc-git.el: This file used to contain the VC-mode backend for git, but it is no longer distributed with git. It is now maintained as part of Emacs and included in standard Emacs distributions starting from version 22.2. If you have an earlier Emacs version, upgrading to Emacs 22 is recommended, since the VC mode in older Emacs is not generic enough to be able to support git in a reasonable manner, and no attempt has been made to backport vc-git.el. debian/git-doc.doc-base.git-user-manual0000664000000000000000000000112412312147625015127 0ustar Document: git-user-manual Title: Git User's Manual (for version 1.5.3 or newer) Author: J. Bruce Fields and the git list Abstract: This manual provides a leisurely but practical introduction to git. Chapters 1 and 2 explain how to fetch and study a project using git. People needing to do actual development will also want to read chapters 3 and 4. Further chapters cover more specialized topics. Section: File Management Format: Text Files: /usr/share/doc/git-doc/user-manual.txt Format: HTML Index: /usr/share/doc/git-doc/user-manual.html Files: /usr/share/doc/git-doc/user-manual.html debian/git-doc.doc-base.git-technical0000664000000000000000000000067712312147625014644 0ustar Document: git-api Title: Git internal API documentation Author: Junio C Hamano and the git list Abstract: Git has grown a set of internal API over time. This collection documents them. Section: Programming/C Format: Text Index: /usr/share/doc/git-doc/technical/api-index.txt Files: /usr/share/doc/git-doc/technical/api-*.txt Format: HTML Index: /usr/share/doc/git-doc/technical/api-index.html Files: /usr/share/doc/git-doc/technical/api-*.html debian/git-daemon-run.prerm0000664000000000000000000000024312312147625013067 0ustar #!/bin/sh set -e test "$1" = 'remove' || test "$1" = 'deconfigure' || \ test "$1" = 'failed-upgrade' || exit 0 update-service --remove /etc/sv/git-daemon || : debian/watch0000664000000000000000000000027712312147625010232 0ustar version=3 https://www.kernel.org/pub/software/scm/git/git-([\d.]+)\.tar\.xz opts="uversionmangle=s/\.rc/~rc/" \ https://www.kernel.org/pub/software/scm/git/testing/git-([\d.]+rc\d+)\.tar\.xz debian/git-bzr.prerm0000775000000000000000000000020212312147625011615 0ustar #!/bin/sh set -e test "$1" != upgrade || exit 0 cmd=git-remote-bzr update-alternatives --remove $cmd /usr/lib/git-core/$cmd--git debian/source/0000775000000000000000000000000012312147625010473 5ustar debian/source/format0000664000000000000000000000001412312147625011701 0ustar 3.0 (quilt) debian/git.conffiles0000664000000000000000000000004212312147625011644 0ustar /etc/bash_completion.d/git-prompt debian/git-doc.doc-base.git-protocol0000664000000000000000000000072612312147625014546 0ustar Document: git-protocol Title: Technical documentation for git protocol Author: Scott Chacon and the git list Abstract: Reference documentation for the upload-pack and receive-pack protocols that underlie git's ssh://, git://, file://, and smart http:// transports. Section: File Management Format: Text Files: /usr/share/doc/git-doc/technical/pack-protocol.txt /usr/share/doc/git-doc/technical/protocol-*.txt /usr/share/doc/git-doc/technical/send-pack-pipeline.txt debian/git-daemon-run.README.Debian0000664000000000000000000000216312312147625014063 0ustar git-daemon-run for Debian ------------------------- This package enables a git-daemon service. This allows people to use a git:// URL to access your repositories. After installing this package, wait five seconds for the git-daemon service to be picked up by runit, and check its status and logs: sv stat git-daemon cat /var/log/git-daemon/current See the sv(8) program on how to manage the service, or, alternatively, create a symbolic link /etc/init.d/git-daemon pointing to /usr/bin/sv to have an LSB compatible interface to control it: ln -s /usr/bin/sv /etc/init.d/git-daemon /etc/init.d/git-daemon status The git daemon by default looks into the directory /var/lib/git/ for repositories (this is configured in /etc/sv/git-daemon/run). It expects the repositories' .git subdirectories in that directory, symlinks pointing to the corresponding subdirectories in the repositories are just fine, e.g.: ln -s ~pape/git/foo/.git /var/lib/git/foo.git This makes 'git-clone git://git.example.org/git/foo' to clone the foo repository on remote machines work. -- Gerrit Pape Sun, 03 Jun 2007 09:51:53 +0000 debian/changelog.upstream0000664000000000000000000624321512312147625012721 0ustar Version v1.9.1; changes since v1.9.0: ------------------------------------- Brad King (4): t3030-merge-recursive: test known breakage with empty work tree read-cache.c: refactor --ignore-missing implementation read-cache.c: extend make_cache_entry refresh flag with options merge-recursive.c: tolerate missing files while refreshing index David Aguilar (1): difftool: support repositories with .git-files David Sharp (1): rev-parse: check i before using argv[i] against argc Jeff King (12): expand_user_path: do not look at NULL path handle_path_include: don't look at NULL value tests: auto-set LIB_HTTPD_PORT from test name t4212: test bogus timestamps with git-log fsck: report integer overflow in author timestamps date: check date overflow against time_t log: handle integer overflow in timestamps log: do not segfault on gmtime errors remote: handle pushremote config in any order show_ident_date: fix tz range check clean: respect pathspecs with "-d" clean: simplify dir/not-dir logic Junio C Hamano (4): t0003: do not chdir the whole test process check-attr: move to the top of working tree when in non-bare repository t7800: add a difftool test for .git-files Git 1.9.1 Nguyễn Thái Ngọc Duy (17): test: rename http fetch and push test files pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done' protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt protocol-capabilities.txt: document no-done fetch-pack: fix deepen shallow over smart http with no-done cap t5537: move http tests out to t5539 reset: optionally setup worktree and refresh index on --mixed pathspec: convert some match_pathspec_depth() to ce_path_match() pathspec: convert some match_pathspec_depth() to dir_path_match() pathspec: rename match_pathspec_depth() to match_pathspec() dir.c: prepare match_pathspec_item for taking more flags match_pathspec: match pathspec "foo/" against directory "foo" pathspec: pass directory indicator to match_pathspec_item() clean: replace match_pathspec() with dir_path_match() clean: use cache_name_is_other() diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later diff: do not quit early on stat-dirty files Sandy Carter (1): i18n: proposed command missing leading dash Thomas Rast (1): diff: do not reuse_worktree_file for submodules Version v1.9.0; changes since v1.9.0-rc3: ----------------------------------------- Jean-Noel Avila (1): l10n: fr: 1.9rc2 2211t Jiang Xin (3): l10n: git.pot: v1.9 round 2 (1 new) l10n: zh_CN.po: translate 1 new message (2211t0f0u) l10n: zh_CN.po: Disambiguation for rebase Junio C Hamano (2): Git 1.8.5.5 Git 1.9.0 Michael J Gruber (1): release notes: typo fixes Peter Krefting (1): l10n: Update Swedish translation (2211t0f0u) Ralf Thielow (2): l10n: de.po: translate 28 new messages l10n: de.po: correct message when hiding commits by craft Tran Ngoc Quan (1): l10n: vi.po (2211t): Updated one new string Version v1.9.0-rc3; changes since v1.9-rc2: ------------------------------------------- Adrian Johnson (1): userdiff: update Ada patterns Junio C Hamano (3): Git 1.8.5.4 howto/maintain-git.txt: new version numbering scheme Git 1.9.0-rc3 Nguyễn Thái Ngọc Duy (1): git-tag.txt: for --contains is optional Torsten Bögershausen (1): repack.c: rename and unlink pack file if it exists Øystein Walle (1): Documentation: fix typos in man pages Version v1.9-rc2; changes since v1.9-rc1: ----------------------------------------- Alexander Shopov (2): po/TEAMS: Added Bulgarian team l10n: Bulgarian translation of git (222t21f1967u) Jean-Noel Avila (1): [fr] update french translation 2210/2210 Jiang Xin (3): l10n: git.pot: v1.9 round 1 (27 new, 11 removed) l10n: zh_CN.po: translate 27 messages (2210t0f0u) l10n: remove 2 blank translations on Danish, Dutch Jonathan Nieder (1): pager test: make fake pager consume all its input Junio C Hamano (1): Git 1.9-rc2 Peter Krefting (1): l10n: Update Swedish translation (2210t0f0u) Tran Ngoc Quan (1): l10n: vi.po (2210t): Updated git-core translation Version v1.9-rc1; changes since v1.9-rc0: ----------------------------------------- Alexander Shopov (4): git-gui i18n: Initial glossary in Bulgarian git-gui l10n: Add 29 more terms to glossary git-gui i18n: Added Bulgarian translation gitk: Add Bulgarian translation (304t) Andy Spencer (1): tree_entry_interesting: match against all pathspecs Anthony Baire (1): subtree: fix argument validation in add/pull/push Astril Hayato (1): gitk: Comply with XDG base directory specification Erik Faye-Lund (2): prefer xwrite instead of write mingw: remove mingw_write Jeff King (18): fetch-pack: do not filter out one-level refs interpret_branch_name: factor out upstream handling interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: always respect "namelen" parameter interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: find all possible @-marks diff_filespec: reorder dirty_submodule macro definitions diff_filespec: drop funcname_pattern_ident field diff_filespec: drop xfrm_flags field diff_filespec: reorder is_binary field diff_filespec: use only 2 bits for is_binary flag t/perf: time rev-list with UNINTERESTING commits list-objects: only look at cmdline trees with edge_hint repack: fix typo in max-pack-size option repack: make parsed string options const-correct repack: propagate pack-objects options as strings t7501: fix "empty commit" test with NO_PERL t7700: do not use "touch" unnecessarily Johannes Sixt (1): Makefile: Fix compilation of Windows resource file John Keeping (3): completion: complete merge-base options completion: handle --[no-]fork-point options to git-rebase Makefile: remove redundant object in git-http{fetch,push} Jonathan Nieder (3): gitignore doc: add global gitignore to synopsis git-gui: chmod +x po2msg, windows/git-gui.sh gitk: chmod +x po2msg.sh Junio C Hamano (6): Documentation: exclude irrelevant options from "git pull" Documentation: "git pull" does not have the "-m" option revision: mark contents of an uninteresting tree uninteresting revision: propagate flag bits from tags to pointees Documentation: make it easier to maintain enumerated documents Git 1.9-rc1 Marc Branchaud (1): gitk: Replace "next" and "prev" buttons with down and up arrows Max Kirillov (2): git-gui: fallback right pane to packed widgets with Tk 8.4 gitk: Fix mistype Michael Haggerty (22): safe_create_leading_directories(): fix format of "if" chaining safe_create_leading_directories(): reduce scope of local variable safe_create_leading_directories(): add explicit "slash" pointer safe_create_leading_directories(): rename local variable safe_create_leading_directories(): split on first of multiple slashes safe_create_leading_directories(): always restore slash at end of loop safe_create_leading_directories(): introduce enum for return values cmd_init_db(): when creating directories, handle errors conservatively safe_create_leading_directories(): add new error value SCLD_VANISHED gitattributes: document more clearly where macros are allowed refname_match(): always use the rules in ref_rev_parse_rules lock_ref_sha1_basic(): on SCLD_VANISHED, retry lock_ref_sha1_basic(): if locking fails with ENOENT, retry remove_dir_recurse(): tighten condition for removing unreadable dir remove_dir_recurse(): handle disappearing files and directories rename_ref(): extract function rename_tmp_log() rename_tmp_log(): handle a possible mkdir/rmdir race rename_tmp_log(): limit the number of remote_empty_directories() attempts rename_tmp_log(): on SCLD_VANISHED, retry safe_create_leading_directories(): on Windows, \ can separate path components Add cross-references between docs for for-each-ref and show-ref doc: remote author/documentation sections from more pages Nguyễn Thái Ngọc Duy (1): tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting() Pat Thoyts (1): git-gui 0.19 Paul Mackerras (2): gitk: Update copyright dates gitk: Indent word-wrapped lines in commit display header Pete Wyckoff (11): git p4 test: wildcards are supported git p4 test: ensure p4 symlink parsing works git p4: work around p4 bug that causes empty symlinks git p4 test: explicitly check p4 wildcard delete git p4 test: is_cli_file_writeable succeeds git p4 test: run as user "author" git p4 test: do not pollute /tmp git p4: handle files with wildcards when doing RCS scrubbing git p4: fix an error message when "p4 where" fails git p4 test: examine behavior with locked (+l) files git p4 doc: use two-line style for options with multiple spellings Ruben Kerkhof (1): send-email: /etc/ssl/certs/ directory may not be usable as ca_path Thomas Ackermann (2): create HTML for http-protocol.txt http-protocol.txt: don't use uppercase for variable names in "The Negotiation Algorithm" Thomas Rast (2): Documentation/gitk: document -L option Documentation: @{-N} can refer to a commit lin zuojian (1): git-svn: memoize _rev_list and rebuild Version v1.9-rc0; changes since v1.8.5.5: ----------------------------------------- Anders Kaseorg (1): submodule foreach: skip eval for more than one argument Antoine Pelisse (2): Prevent buffer overflows when path is too long remote-hg: test 'shared_path' in a moved clone Benny Siegert (1): Add MirBSD support to the build system. Brodie Rao (1): sha1_name: don't resolve refs when core.warnambiguousrefs is false Carlos Martín Nieto (1): send-pack: don't send a thin pack to a server which doesn't support it Christian Couder (15): environment: normalize use of prefixcmp() by removing " != 0" builtin/remote: remove postfixcmp() and use suffixcmp() instead strbuf: introduce starts_with() and ends_with() replace {pre,suf}fixcmp() with {starts,ends}_with() rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT replace_object: don't check read_replace_refs twice sha1_file.c: add lookup_replace_object_extended() to pass flags sha1_object_info_extended(): add an "unsigned flags" parameter t6050: show that git cat-file --batch fails with replace objects sha1_file: perform object replacement in sha1_object_info_extended() builtin/replace: teach listing using short, medium or full formats t6050: add tests for listing with --format builtin/replace: unset read_replace_refs Documentation/git-replace: describe --format option replace info: rename 'full' to 'long' and clarify in-code symbols Crestez Dan Leonard (1): git p4: Use git diff-tree instead of format-patch Felipe Contreras (9): test-lib.sh: convert $TEST_DIRECTORY to an absolute path test-bzr.sh, test-hg.sh: allow running from any dir remote-helpers: add extra safety checks remote-hg: fix 'shared path' path remote-hg: add tests for special filenames abspath: trivial style fix t: trivial whitespace cleanups fetch: add missing documentation remote: fix status with branch...rebase=preserve Francesco Pretto (1): git-submodule.sh: 'checkout' is a valid update mode Greg Jacobson (1): push: enhance unspecified push default warning Jeff King (24): log_tree_diff: die when we fail to parse a commit assume parse_commit checks commit->object.parsed assume parse_commit checks for NULL commit use parse_commit_or_die instead of segfaulting use parse_commit_or_die instead of custom message checkout: do not die when leaving broken detached HEAD sha1write: make buffer const-correct use @@PERL@@ in built scripts http: return curl's AUTHAVAIL via slot_results remote-curl: pass curl slot_results back through run_slot drop support for "experimental" loose objects t5000: simplify gzip prerequisite checks pack-objects: name pack files after trailer hash pack-objects doc: treat output filename as opaque diff.c: fix some recent whitespace style violations builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX do not pretend sha1write returns errors sha1_object_info_extended: provide delta base sha1s cat-file: provide %(deltabase) batch format use distinct username/password for http auth tests t0000: set TEST_OUTPUT_DIRECTORY for sub-tests t0000: simplify HARNESS_ACTIVE hack t0000: drop "known breakage" test t5531: further "matching" fixups Jens Lehmann (3): submodule update: remove unnecessary orig_flags variable mv: better document side effects when moving a submodule rm: better document side effects when removing a submodule Johannes Sixt (1): document --exclude option John Keeping (8): repo-config: remove deprecated alias for "git config" tar-tree: remove deprecated command lost-found: remove deprecated command peek-remote: remove deprecated alias of ls-remote pull: use merge-base --fork-point when appropriate rebase: use reflog to find common base with upstream rebase: fix fork-point with zero arguments pull: suppress error when no remoteref is found John Murphy (1): git-gui: corrected setup of git worktree under cygwin. John Szakmeister (1): contrib/git-credential-gnome-keyring.c: small stylistic cleanups Jonathan Nieder (16): git-remote-mediawiki: do not remove installed files in "clean" target git-remote-mediawiki: honor DESTDIR in "make install" git-remote-mediawiki build: make 'install' command configurable git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace Makefile: rebuild perl scripts when perl paths change Makefile: add PERLLIB_EXTRA variable that adds to default perl path mark Windows build scripts executable mark perl test scripts executable mark contributed hooks executable contrib: remove git-p4import test: make FILEMODE a lazy prereq test: replace shebangs with descriptions in shell libraries remove #!interpreter line from shell libraries stop installing git-tar-tree link pager: set LV=-c alongside LESS=FRSX diff test: reading a directory as a file need not error out Junio C Hamano (17): revision: introduce --exclude= to tame wildcards merge-base: use OPT_CMDMODE and clarify the command line parsing merge-base: teach "--fork-point" mode rev-list --exclude: tests rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API rev-parse: introduce --exclude= to tame wildcards bundle: use argv-array builtin/push.c: use strbuf instead of manual allocation push: use remote.$name.push as a refmap push: also use "upstream" mapping when pushing a single ref Start 1.9 cycle Update draft release notes to 1.9 prune-packed: use strbuf to avoid having to worry about PATH_MAX Update draft release notes to 1.9 Update draft release notes to 1.9 Update draft release notes to 1.9 Git 1.9-rc0 Karsten Blees (1): gitignore.txt: clarify recursive nature of excluded directories Krzesimir Nowak (4): gitweb: Move check-ref-format code into separate function gitweb: Return 1 on validation success instead of passed input gitweb: Add a feature for adding more branch refs gitweb: Denote non-heads, non-remotes branches Mads Dørup (1): git-gui: Improve font rendering on retina macbooks Masanari Iida (1): git-gui: correct spelling errors in comments Max Kirillov (2): git-gui: Add gui.displayuntracked option git-gui: right half window is paned Michael Haggerty (26): t5510: use the correct tag name in test t5510: prepare test refs more straightforwardly t5510: check that "git fetch --prune --tags" does not prune branches api-remote.txt: correct section "struct refspec" get_ref_map(): rename local variables builtin/fetch.c: reorder function definitions get_expanded_map(): add docstring get_expanded_map(): avoid memory leak fetch: only opportunistically update references based on command line fetch --tags: fetch tags *in addition to* other stuff fetch --prune: prune only based on explicit refspecs query_refspecs(): move some constants out of the loop builtin/remote.c: reorder function definitions builtin/remote.c:update(): use struct argv_array fetch, remote: properly convey --no-prune options to subprocesses fetch-options.txt: simplify ifdef/ifndef/endif usage git-fetch.txt: improve description of tag auto-following ref_remove_duplicates(): avoid redundant bisection t5536: new test of refspec conflicts when fetching ref_remove_duplicates(): simplify loop logic ref_remote_duplicates(): extract a function handle_duplicate() handle_duplicate(): mark error message for translation fetch: improve the error messages emitted for conflicting refspecs shorten_unambiguous_ref(): introduce a new local variable gen_scanf_fmt(): delete function and use snprintf() instead shorten_unambiguous_ref(): tighten up pointer arithmetic Nguyễn Thái Ngọc Duy (36): wt-status: take the alignment burden off translators gettext.c: detect the vsnprintf bug at runtime glossary-content.txt: rephrase magic signature part Support pathspec magic :(exclude) and its short form :! pathspec.c: support adding prefix magic to a pathspec with mnemonic magic parse-options: remove OPT_BOOLEAN transport.h: remove send_pack prototype, already defined in send-pack.h remote.h: replace struct extra_have_objects with struct sha1_array send-pack: forbid pushing from a shallow repository clone: prevent --reference to a shallow repository make the sender advertise shallow commits to the receiver connect.c: teach get_remote_heads to parse "shallow" lines shallow.c: extend setup_*_shallow() to accept extra shallow commits shallow.c: the 8 steps to select new commits for .git/shallow shallow.c: steps 6 and 7 to select new commits for .git/shallow fetch-pack.c: move shallow update code out of fetch_pack() fetch-pack.h: one statement per bitfield declaration clone: support remote shallow repository fetch: support fetching from a shallow repository upload-pack: make sure deepening preserves shallow roots fetch: add --update-shallow to accept refs that update .git/shallow receive-pack: reorder some code in unpack() receive/send-pack: support pushing from a shallow clone add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses connected.c: add new variant that runs with --shallow-file receive-pack: allow pushes that update .git/shallow send-pack: support pushing to a shallow clone remote-curl: pass ref SHA-1 to fetch-pack as well smart-http: support shallow fetch/clone receive-pack: support pushing to a shallow clone via http send-pack: support pushing from a shallow clone via http clone: use git protocol for cloning shallow repo locally prune: clean .git/shallow after pruning objects git-clone.txt: remove shallow clone limitations commit.c: make "tree" a const pointer in commit_tree*() t5537: fix incorrect expectation in test case 10 Nicolas Vigier (2): Use the word 'stuck' instead of 'sticked' rev-parse --parseopt: add the --stuck-long mode Pat Thoyts (3): git-gui: added gui.maxrecentrepo to extend the number of remembered repos git-gui: show the maxrecentrepo config option in the preferences dialog git-gui: add menu item to launch a bash shell on Windows. Paul Mackerras (1): gitk: Tag display improvements Ramkumar Ramachandra (11): t6300 (for-each-ref): clearly demarcate setup t6300 (for-each-ref): don't hardcode SHA-1 hexes for-each-ref: introduce %(HEAD) asterisk marker for-each-ref: introduce %(upstream:track[short]) for-each-ref: introduce %(color:...) for color for-each-ref: avoid color leakage zsh completion: find matching custom bash completion completion: introduce __gitcomp_nl_append () completion: fix branch.autosetup(merge|rebase) completion: fix remote.pushdefault completion: complete format.coverLetter Ramsay Allan Jones (2): send-pack.c: mark a file-local function static shallow: remove unused code Richard Hansen (6): test-bzr.sh, test-hg.sh: prepare for change to push.default=simple test-hg.sh: eliminate 'local' bashism test-hg.sh: avoid obsolete 'test' syntax test-hg.sh: fix duplicate content strings in author tests test-hg.sh: help user correlate verbose output with email test remote-bzr, remote-hg: fix email address regular expression Roberto Tyley (1): docs: add filter-branch notes on The BFG Roman Kagan (1): git-svn: workaround for a bug in svn serf backend Samuel Bronson (3): t4056: add new tests for "git diff -O" diff: let "git diff -O" read orderfile from any file and fail properly diff: add diff.orderfile configuration variable Sebastian Schuberth (3): git.c: consistently use the term "builtin" instead of "internal command" builtin/help.c: call load_command_list() only when it is needed builtin/help.c: speed up is_git_command() by checking for builtin commands first Thomas Ackermann (1): user-manual: improve html and pdf formatting Thomas Gummerer (4): diff: move no-index detection to builtin/diff.c diff: don't read index when --no-index is given diff: add test for --no-index executed outside repo diff: avoid some nesting Thomas Rast (9): commit-slab: document clear_$slabname() commit-slab: declare functions "static inline" gitk: Support -G option from the command line gitk: Refactor per-line part of getblobdiffline and its support gitk: Split out diff part in $commitinfo gitk: Support showing the gathered inline diffs gitk: Recognize -L option commit-slab: sizeof() the right type in xrealloc config: arbitrary number of matches for --unset and --replace-all Tom Miller (2): fetch --prune: always print header url fetch --prune: Run prune before fetching Vasily Makarov (1): get_octopus_merge_bases(): cleanup redundant variable Zoltan Klinger (1): difftool: display the number of files in the diff queue in the prompt brian m. carlson (2): remote-curl: fix large pushes with GSSAPI Documentation: document pitfalls with 3-way merge jcb91 (1): remote-hg: avoid buggy strftime() Version v1.8.5.5; changes since v1.8.5.4: ----------------------------------------- Andy Spencer (1): tree_entry_interesting: match against all pathspecs Jeff King (9): fetch-pack: do not filter out one-level refs interpret_branch_name: factor out upstream handling interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: always respect "namelen" parameter interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: find all possible @-marks repack: fix typo in max-pack-size option repack: make parsed string options const-correct repack: propagate pack-objects options as strings Junio C Hamano (5): merge-base: separate "--independent" codepath into its own helper merge-base --octopus: reduce the result from get_octopus_merge_bases() revision: mark contents of an uninteresting tree uninteresting revision: propagate flag bits from tags to pointees Git 1.8.5.5 Ruben Kerkhof (1): send-email: /etc/ssl/certs/ directory may not be usable as ca_path Version v1.8.5.4; changes since v1.8.5.3: ----------------------------------------- Jens Lehmann (1): commit -v: strip diffs and submodule shortlogs from the commit message Johannes Schindelin (1): Remove the line length limit for graft files Johannes Sixt (2): git_connect: remove artificial limit of a remote command git_connect: factor out discovery of the protocol and its parts Junio C Hamano (4): get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure Documentation: exclude irrelevant options from "git pull" Documentation: "git pull" does not have the "-m" option Git 1.8.5.4 Nguyễn Thái Ngọc Duy (2): clone,fetch: catch non positive --depth option value add: don't complain when adding empty project root Roman Kagan (1): git-svn: workaround for a bug in svn serf backend Thomas Rast (3): send-email: pass Debug to Net::SMTP::SSL::new send-email: --smtp-ssl-cert-path takes an argument send-email: set SSL options through IO::Socket::SSL::set_client_defaults Torsten Bögershausen (8): t5601: remove clear_ssh, refactor setup_ssh_wrapper t5601: add tests for ssh git fetch-pack: add --diag-url t5500: add test cases for diag-url git fetch: support host:/~repo git_connect(): refactor the port handling for ssh connect.c: refactor url parsing git_connect(): use common return point brian m. carlson (1): log: properly handle decorations with chained tags Øystein Walle (1): stash: handle specifying stashes with $IFS Version v1.8.5.3; changes since v1.8.5.2: ----------------------------------------- Jeff King (5): rev-parse: correctly diagnose revision errors before "--" rev-parse: be more careful with munging arguments cat-file: pass expand_data to print_object_or_die cat-file: handle --batch format with missing type/size Revert "prompt: clean up strbuf usage" Johannes Sixt (1): mv: let 'git mv file no-such-dir/' error out on Windows, too Junio C Hamano (1): Git 1.8.5.3 Kyle J. McKay (1): gc: notice gc processes run by other users Matthieu Moy (1): mv: let 'git mv file no-such-dir/' error out Nguyễn Thái Ngọc Duy (1): daemon: be strict at parsing parameters --[no-]informative-errors Ralf Thielow (1): l10n: de.po: fix translation of 'prefix' Ramkumar Ramachandra (1): for-each-ref: remove unused variable Thomas Ackermann (1): pack-heuristics.txt: mark up the file header properly W. Trevor King (1): Documentation/gitmodules: Only 'update' and 'url' are required Version v1.8.5.2; changes since v1.8.5.1: ----------------------------------------- Jason St. John (6): Documentation/git-log: update "--log-size" description Documentation/git-log.txt: mark-up fix and minor rephasing State correct usage of literal examples in man pages in the coding standards Documentation/rev-list-options.txt: fix mark-up Documentation/rev-list-options.txt: fix some grammatical issues and typos Documentation/gitcli.txt: fix double quotes Jeff King (1): unpack-trees: fix "read-tree -u --reset A B" with conflicted index Johan Herland (1): sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs Junio C Hamano (4): t1005: reindent t1005: add test for "read-tree --reset -u A B" sha1_loose_object_info(): do not return success on missing object Git 1.8.5.2 Masanari Iida (3): typofixes: fix misspelt comments Documentation/technical/http-protocol.txt: typofixes contrib: typofixes Michael Haggerty (1): cmd_repack(): remove redundant local variable "nr_packs" Nguyễn Thái Ngọc Duy (2): diff: restrict pathspec limitations to diff b/f case only glossary-content.txt: fix documentation of "**" patterns René Scharfe (1): SubmittingPatches: document how to handle multiple patches Thomas Rast (1): Documentation: revamp git-cherry(1) Torsten Bögershausen (1): git-fetch-pack uses URLs like git-fetch Version v1.8.5.1; changes since v1.8.5: --------------------------------------- Junio C Hamano (3): submodule: do not copy unknown update mode from .gitmodules Git 1.8.4.5 Git 1.8.5.1 Nick Townsend (1): ref-iteration doc: add_submodule_odb() returns 0 for success Version v1.8.5; changes since v1.8.5-rc3: ----------------------------------------- Junio C Hamano (1): Git 1.8.5 Richard Hansen (2): remote-hg: don't decode UTF-8 paths into Unicode objects remote-hg: don't decode UTF-8 paths into Unicode objects Version v1.8.5-rc3; changes since v1.8.5-rc2: --------------------------------------------- Junio C Hamano (3): Revert "upload-pack: send non-HEAD symbolic refs" Git 1.8.4.4 Git 1.8.5-rc3 Marc Branchaud (1): RelNotes: spelling & grammar fixes Nguyễn Thái Ngọc Duy (1): pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses Torstein Hegge (1): branch: fix --verbose output column alignment Version v1.8.5-rc2; changes since v1.8.5-rc1: --------------------------------------------- Jason St. John (1): Correct word usage of "timezone" in "Documentation" directory Jean-Noel Avila (1): l10n: fr.po 2194/1294 messages translated Jiang Xin (2): l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed) l10n: zh_CN.po: translate 68 messages (2194t0f0u) Junio C Hamano (3): Start preparing for 1.8.4.3 Git 1.8.4.3 Git 1.8.5-rc2 Karsten Blees (1): gitignore.txt: fix documentation of "**" patterns Peter Krefting (1): l10n: Update Swedish translation (2194t0f0u) Ralf Thielow (3): po/TEAMS: update Thomas Rast's email address l10n: de.po: translate 68 new messages l10n: de.po: improve error message when pushing to unknown upstream Tran Ngoc Quan (1): l10n: vi.po (2194t): Update and minor fix Version v1.8.5-rc1; changes since v1.8.5-rc0: --------------------------------------------- Anders Kaseorg (1): cvsserver: Determinize output to combat Perl 5.18 hash randomization Antoine Pelisse (1): remote-hg: unquote C-style paths when exporting Ben Walton (2): Change sed i\ usage to something Solaris' sed can handle Avoid difference in tr semantics between System V and BSD Felipe Contreras (12): merge: simplify ff-only option t: replace pulls with merges revision: add missing include branch: trivial style fix sha1-name: trivial style cleanup transport-helper: trivial style fix describe: trivial style fixes pretty: trivial style fix revision: trivial style fixes diff: trivial style fix run-command: trivial style fixes setup: trivial style fixes Jeff King (7): add-interactive: handle unborn branch in patch mode reset: pass real rev name to add--interactive howto: add article on recovering a corrupted object t: provide a perl() function which uses $PERL_PATH t: use perl instead of "$PERL_PATH" where applicable for-each-ref: avoid loading objects to print %(objectname) subtree: add makefile target for html docs Jens Lehmann (1): mv: Fix spurious warning when moving a file in presence of submodules Johannes Sixt (4): t5300-pack-object: do not compare binary data using test_cmp Windows: a test_cmp that is agnostic to random LF <> CRLF conversions tests: undo special treatment of CRLF for Windows t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html Jonathan Nieder (1): t/README: tests can use perl even with NO_PERL Junio C Hamano (5): doc/pull: clarify the illustrations Update draft release notes to 1.8.5 t4015: simplify sed command that is not even seen by sed Update draft release notes to 1.8.5 Git 1.8.5-rc1 Kacper Kornet (1): Fix '\%o' for printf from coreutils Rüdiger Sonderfeld (1): web--browse: Add support for xdg-open Sitaram Chamarty (1): doc/howto: warn about (dumb)http server document being too old Stefan Beller (2): refs: remove unused function invalidate_ref_cache cache: remove unused function 'have_git_dir' Vivien Didelot (2): Documentation: restore a space in unpack-objects usage Documentation: "pack-file" is not literal in unpack-objects Version v1.8.5-rc0; changes since v1.8.4.5: ------------------------------------------- Alexandru Juncu (1): git-p4: Fix occasional truncation of symlink contents. Antoine Pelisse (1): remote-hg: fix path when cloning with tilde expansion Brad King (8): reset: rename update_refs to reset_refs refs: report ref type from lock_any_ref_for_update refs: factor update_ref steps into helpers refs: factor delete_ref loose ref step into a helper refs: add function to repack without multiple refs refs: add update_refs for multiple simultaneous updates update-ref: support multiple simultaneous updates update-ref: add test cases covering --stdin signature Brandon Casey (18): sha1_file: introduce close_one_pack() to close packs on fd pressure Don't close pack fd when free'ing pack windows contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations contrib/git-credential-gnome-keyring.c: remove unused die() function contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc. contrib/git-credential-gnome-keyring.c: add static where applicable contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing contrib/git-credential-gnome-keyring.c: set Gnome application name contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object() contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords contrib/git-credential-gnome-keyring.c: use glib memory allocation functions contrib/git-credential-gnome-keyring.c: use glib messaging functions contrib/git-credential-gnome-keyring.c: report failure to store password contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring Brian Gernhardt (3): Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 OS X: Fix redeclaration of die warning t5551: Remove header from curl cookie file Christian Couder (7): replace: forbid replacing an object with one of a different type Documentation/replace: state that objects must be of the same type t6050-replace: test that objects are of the same type t6050-replace: add test to clean up all the replace refs Documentation/replace: add Creating Replacement Objects section replace: allow long option names t6050-replace: use some long option names Dale R. Worley (2): t0070: test that git_mkstemps correctly checks return value of open() diff --no-index: clarify operation when not inside a repository Dave Borowitz (1): http: add http.savecookies option to write out HTTP cookies Dave Williams (1): check-ignore: Add option to ignore index contents Eric Sunshine (36): t8001/t8002: blame: decompose overly-large test t8001/t8002: blame: demonstrate -L bounds checking bug t8001/t8002: blame: add empty file & partial-line tests blame: fix -L bounds checking bug t4211: log: demonstrate -L bounds checking bug t4211: retire soon-to-be unimplementable tests log: fix -L bounds checking bug t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0 blame: reject empty ranges -LX,+0 and -LX,-0 t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0 blame: reject empty ranges -L,+0 and -L,-0 git-log.txt: place each -L option variation on its own line line-range-format.txt: clarify -L:regex usage form range-set: publish API for re-use by git-blame -L blame: inline one-line function into its lone caller blame: accept multiple -L ranges t8001/t8002: blame: add tests of multiple -L options blame: document multiple -L support line-range: teach -L/RE/ to search relative to anchor point blame: teach -L/RE/ to search from end of previous -L range log: teach -L/RE/ to search from end of previous -L range line-range-format.txt: document -L/RE/ relative search line-range: teach -L^/RE/ to search from start of file line-range: teach -L:RE to search from end of previous -L range line-range: teach -L^:RE to search from start of file t8001/t8002: blame: add tests of -L line numbers less than 1 line-range: reject -L line numbers less than 1 contacts: validate hunk length earlier contacts: gather all blame sources prior to invoking git-blame contacts: reduce git-blame invocations name-hash: refactor polymorphic index_name_exists() employ new explicit "exists in index?" API name-hash: stop storing trailing '/' on paths in index_state.dir_hash dir: revert work-around for retired dangerous behavior t7508: avoid non-portable sed expression contacts: fix to work in subdirectories Eric Wong (1): http: enable keepalive on TCP sockets Felipe Contreras (26): remote-hg: ensure shared repo is initialized remote-hg: add shared repo upgrade unpack-trees: plug a memory leak remote-bzr: fix export of utf-8 authors remote-bzr: make bzr branches configurable per-repo remote-hg: fix test remote-hg: add missing &&s in the test remote-hg: improve basic test remote-helpers: trivial style fixes remote-helpers: cleanup more global variables remote-hg: use notes to keep track of Hg revisions reset: trivial refactoring branch: trivial style fix reset: trivial style cleanup add: trivial style cleanup sha1-name: pass len argument to interpret_branch_name() t: branch: trivial style fix t: branch: fix typo t: branch: fix broken && chains fast-export: make extra_refs global fast-export: refactor get_tags_and_duplicates() rev-parse test: modernize quoting and whitespace rev-parse test: use test_must_fail, not "if ; then false; fi" rev-parse test: use standard test functions for setup Add new @ shortcut for HEAD alias: have SP around arithmetic operators Gerrit Pape (1): hooks/post-receive-email: set declared encoding to utf-8 Hiroshige Umino (1): cherry-pick: allow "-" as abbreviation of '@{-1}' Jean-Noel Avila (1): l10n: fr.po: 2135/2135 messages translated Jeff King (22): grep: allow to use textconv filters clear parsed flag when we free tree buffers cat-file: only split on whitespace when %(rest) is used test-sha1: add a binary output mode sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP add tests for indexing packs with delta cycles test index-pack on packs with recoverable delta cycles write_index: optionally allow broken null sha1s pager: turn on "cat" optimization for DEFAULT_PAGER peel_onion: do not assume length of x_type globals t5308: check that index-pack --strict detects duplicate objects config: factor out integer parsing from range checks config: properly range-check integer values config: set errno in numeric git_parse_* functions config: make numeric parsing errors more clear git-config: always treat --int as 64-bit internally t5541: mark passing c-a-s test as success cherry-pick: handle "-" after parsing options remote: do not copy "origin" string literal http: use curl's tcp keepalive if available drop redundant semicolon in empty while silence gcc array-bounds warning Jens Lehmann (6): mv: move submodules together with their work trees mv: move submodules using a gitfile submodule.c: add .gitmodules staging helper functions mv: update the path entry in .gitmodules for moved submodules rm: delete .gitmodules entry of submodules removed from the work tree Improve documentation concerning the status.submodulesummary setting Jens Lindstrom (1): Clear fd after closing to avoid double-close error Jeremy Huddleston (1): imap-send: use Apple's Security framework for base64 encoding Jiang Xin (6): branch: report invalid tracking branch as gone status: always show tracking branch even no change documentation: clarify notes for clean.requireForce test: use unambigous leading path (/foo) for MSYS relative_path should honor dos-drive-prefix Use simpler relative_path when set_git_dir Johan Herland (3): sample pre-commit hook: use --bool when retrieving config var Documentation/git-svn: Promote the use of --prefix in docs + examples git-svn: Warn about changing default for --prefix in Git v2.0 Johannes Sixt (1): compat/mingw.h: define PRId64 John Keeping (10): t9300: document fast-import empty path issues fast-import: set valid mode on root tree in "ls" fast-import: allow ls or filecopy of the root tree fast-import: allow moving the root tree rev-parse: remove restrictions on some options rev-parse(1): logically group options git_remote_helpers: remove little used Python library rm: re-use parse_pathspec's trailing-slash removal reset: handle submodule with trailing slash Documentation/Makefile: make AsciiDoc dblatex dir configurable Jonathan Nieder (7): hooks/post-receive-email: use plumbing instead of git log/show hooks/post-receive-email: force log messages in UTF-8 add -i test: use skip_all instead of repeated PERL prerequisite reset test: modernize style rev-parse test: use test_cmp instead of "test" builtin status test: add missing && to <.key t5540/5541: smart-http does not support "--force-with-lease" send-pack: fix parsing of --force-with-lease option push: teach --force-with-lease to smart-http transport builtin/config: refactor collect_config() config: "git config --get-urlmatch" parses section..key builtin/config.c: compilation fix core-tutorial: trim the section on Inspecting Changes whatchanged: document its historical nature diff --no-index: describe in a separate paragraph config: rewrite core.pager documentation Start the post-1.8.4 cycle contrib/remote-helpers: style updates for test scripts contrib/remote-helpers: quote variable references in redirection targets Update draft release notes after merging the first batch of topics typofix: commit is spelled with two ems typofix: cherry is spelled with two ars Update draft release notes to 1.8.5 for the second batch of topics checkout: update synopsys and documentation on detaching HEAD Update draft release notes to 1.8.5 mailmap: work around implementations with pure inline strcasecmp Update draft release notes to 1.8.5 for the third batch of topics Update draft release notes to 1.8.5 for the first half of the fourth batch Update draft release notes to 1.8.5 for the fourth batch of topics Update draft release notes to 1.8.5 for the fifth batch of topics C: have space around && and || operators abspath.c: have SP around arithmetic operators alloc.c: have SP around arithmetic operators archive.c: have SP around arithmetic operators base85.c: have SP around arithmetic operators block-sha1/sha1.c: have SP around arithmetic operators Update draft release notes to 1.8.5 Update draft release notes to 1.8.5 Update draft release notes to 1.8.5 Update draft release notes to 1.8.5 checkout_entry(): clarify the use of topath[] parameter Almost -rc0 for 1.8.5 Git 1.8.5-rc0 Kacper Kornet (2): Make test "using invalid commit with -C" more strict t/t7106-reset-unborn-branch.sh: Add PERL prerequisite Karsten Blees (3): MSVC: fix compile errors due to missing libintl.h MSVC: fix compile errors due to macro redefinitions MSVC: fix stat definition hell Kazuki Saitoh (1): git p4: implement view spec wildcards with "p4 where" Keshav Kini (4): git-svn.txt: fix AsciiDoc formatting error git-svn.txt: reword description of gc command git-svn.txt: replace .git with $GIT_DIR git-svn.txt: elaborate on rev_map files Kirill A. Shutemov (1): rebase -i: respect core.abbrev Kyle J. McKay (2): config: add helper to normalize and match URLs config: parse http.. using urlmatch Lee Carver (1): Allow git-filter-branch to process large repositories with lots of branches. Marc Branchaud (1): Provide some linguistic guidance for the documentation. Mark Levedahl (1): t6131 - skip tests if on case-insensitive file system Matthieu Moy (16): Documentation/fast-import: clarify summary for `feature` command Documentation/remote-helpers: document common use-case for private ref git-remote-mediawiki: add test and check Makefile targets transport-helper: add no-private-update capability git-remote-mediawiki: use no-private-update capability on dumb push git-remote-mediawiki: no need to update private ref in non-dumb push builtin/stripspace.c: fix broken indentation wt-status: use argv_array API submodule summary: ignore --for-status option status: disable display of '#' comment prefix by default tests: don't set status.displayCommentPrefix file-wide status: add missing blank line after list of "other" files commit: factor status configuration is a helper function wt-status: turn advice_status_hints into a field of wt_status commit: disable status hints when writing to COMMIT_EDITMSG RelNotes/1.8.5: direct script writers to "git status --porcelain" Michael J Gruber (5): t4030: demonstrate behavior of show with textconv show: honor --textconv for blobs cat-file: do not die on --textconv without textconv filters t7008: demonstrate behavior of grep with textconv grep: honor --textconv for the case rev:path Michael S. Tsirkin (1): doc: don't claim that cherry calls patch-id Michael Schubert (1): fetch: make --prune configurable Michal Nazarewicz (1): remove dead pastebin link from pack-heuristics document Nazri Ramliy (2): git: run in a directory given with -C option t0056: "git -C" test updates Nguyễn Thái Ngọc Duy (57): clean: remove unused variable "seen" move struct pathspec and related functions to pathspec.[ch] pathspec: i18n-ize error strings in pathspec parsing code pathspec: add copy_pathspec add parse_pathspec() that converts cmdline args to struct pathspec parse_pathspec: save original pathspec for reporting parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} flags convert some get_pathspec() calls to parse_pathspec() parse_pathspec: add special flag for max_depth feature parse_pathspec: support stripping submodule trailing slashes parse_pathspec: support stripping/checking submodule paths parse_pathspec: support prefixing original patterns guard against new pathspec magic in pathspec matching code clean: convert to use parse_pathspec commit: convert to use parse_pathspec status: convert to use parse_pathspec rerere: convert to use parse_pathspec checkout: convert to use parse_pathspec rm: convert to use parse_pathspec ls-files: convert to use parse_pathspec archive: convert to use parse_pathspec check-ignore: convert to use parse_pathspec add: convert to use parse_pathspec reset: convert to use parse_pathspec line-log: convert to use parse_pathspec convert read_cache_preload() to take struct pathspec convert run_add_interactive to use struct pathspec convert unmerge_cache to take struct pathspec checkout: convert read_tree_some to take struct pathspec convert report_path_error to take struct pathspec convert refresh_index to take struct pathspec convert {read,fill}_directory to take struct pathspec convert add_files_to_cache to take struct pathspec convert common_prefix() to use struct pathspec remove diff_tree_{setup,release}_paths remove init_pathspec() in favor of parse_pathspec() remove match_pathspec() in favor of match_pathspec_depth() tree-diff: remove the use of pathspec's raw[] in follow-rename codepath rename field "raw" to "_raw" in struct pathspec parse_pathspec: make sure the prefix part is wildcard-free parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN kill limit_pathspec_to_literal() as it's only used by parse_pathspec() pathspec: support :(literal) syntax for noglob pathspec pathspec: make --literal-pathspecs disable pathspec magic pathspec: support :(glob) syntax parse_pathspec: accept :(icase)path syntax smart http: use the same connectivity check on cloning for-each-ref, quote: convert *_quote_print -> *_quote_buf gc: reject if another gc is running, unless --force is given push: respect --no-thin pathspec: catch prepending :(prefix) on pathspec with short magic add: lift the pathspec magic restriction on "add -p" pack-objects: no crc check when the cached version is used fetch-pack.c: show correct command name that fails clone: tighten "local paths with colons" check a bit Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags entry.c: convert checkout_entry to use strbuf Nicolas Pitre (1): lookup_object: remove hashtable_index() and optimize hash_obj() Nicolas Vigier (2): git-svn: fix signed commit parsing config doc: user.signingkey is also used for signed commits Philip Oakley (6): Doc: 'replace' merge and non-merge commits doc: command line interface (cli) dot-repository dwimmery config doc: update dot-repository notes remote doc: document long forms of set-head options remote set-head -h: add long options to synopsis doc/cli: make "dot repository" an independent bullet point Ralf Thielow (2): Documentation/git-merge-file: document option "--diff3" status: show commit sha1 in "You are currently cherry-picking" message Ramkumar Ramachandra (3): editor: use canonicalized absolute path tar-tree: remove dependency on sq_quote_print() quote: remove sq_quote_print() Ramsay Allan Jones (8): howto/setup-git-server-over-http: fix unescaped '^'s howto/revert-a-faulty-merge: fix unescaped '^'s config.c: mark file-local function static refs.c: spell NULL pointer as NULL wrapper.c: only define gitmkstemps if needed gitweb test: fix highlight test hang on Linux Mint format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0 sparse: suppress some "using sizeof on a function" warnings René Scharfe (1): pull: use $curr_branch_short more Richard Hansen (9): peel_onion(): add support for ^{tag} glossary: mention 'treeish' as an alternative to 'tree-ish' glossary: define commit-ish (a.k.a. committish) use 'tree-ish' instead of 'treeish' use 'commit-ish' instead of 'committish' glossary: more precise definition of tree-ish (a.k.a. treeish) revisions.txt: fix and clarify ^{} glossary: fix and clarify the definition of 'ref' remote-bzr: reuse bzrlib transports when possible SZEDER Gábor (3): bash prompt: test the prompt with newline in repository path completion: improve untracked directory filtering for filename completion t3600: fix broken "choking git rm" test Sebastian Schuberth (5): Documentation: make AsciiDoc links always point to HTML files MinGW: Fix stat definitions to work with MinGW runtime version 4.0 Windows: do not redefine _WIN32_WINNT clone: add a period after "done" to end the sentence path-utils test: rename mingw_path function to print_path Shawn O. Pearce (1): Document the HTTP transport protocols Stefan Beller (22): rm: do not set a variable twice without intermediate reading. Remove deprecated OPTION_BOOLEAN for parsing arguments Replace deprecated OPT_BOOLEAN by OPT_BOOL log, format-patch: parsing uses OPT__QUIET checkout: remove superfluous local variable branch, commit, name-rev: ease up boolean conditions hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP config parsing options: allow one flag multiple times checkout-index: fix negations of even numbers of -n revert: use the OPT_CMDMODE for parsing, reducing code diff: remove ternary operator evaluating always to true diff: fix a possible null pointer dereference rm: remove unneeded null pointer check create_delta_index: simplify condition always evaluating to true mailmap: remove redundant check for freeing memory repack: rewrite the shell script in C repack: retain the return value of pack-objects repack: improve warnings about failure of renaming and removing files contrib: remove ciabot checkout test: enable test with complex relative path Reword repack documentation to no longer state it's a script git-svn docs: Use tabs consistently within the ascii doc Stefan Saasen (2): mergetools/diffmerge: support DiffMerge as a git mergetool mergetool--lib: Fix typo in the merge/difftool help Steffen Prohaska (1): git.txt: fix asciidoc syntax of --*-pathspecs Stephen Haberman (1): pull: allow pull to preserve merges when rebasing Ted Zlatanov (1): git-credential-netrc: fix uninitialized warning Thomas Ackermann (11): Call it "Git User Manual" and remove reference to very old Git version Use current "detached HEAD" message Use current output for "git repack" Use "git merge" instead of "git pull ." Fix some typos and improve wording Simplify "How to make a commit" Improve section "Manipulating branches" Improve section "Merging multiple trees" Remove unnecessary historical note from "Object storage format" Remove irrelevant reference from "Tying it all together" "git prune" is safe Thomas Gummerer (1): read-cache: use fixed width integer types Thomas Rast (5): urlmatch.c: recompute pointer after append_normalized_escapes .mailmap: switch to Thomas Rast's personal address Documentation: revamp gitk(1) Revert "test-lib: support running tests under valgrind in parallel" Revert "test-lib: allow prefixing a custom string before "ok N" etc." Tony Finch (4): gitweb: ensure OPML text fits inside its box gitweb: vertically centre contents of page footer gitweb: omit the repository owner when it is unset gitweb: make search help link less ugly Torsten Bögershausen (1): Set core.precomposeunicode to true on e.g. HFS+ Uli Heller (1): git-svn: fix termination issues for remote svn connections brian m. carlson (3): submodule: fix confusing variable name submodule: don't print status output with ignore=all CodingGuidelines: style for multi-line comments kazuki saitoh (1): git p4 test: sanitize P4CHARSET Ævar Arnfjörð Bjarmason (1): gitweb: Fix the author initials in blame for non-ASCII names Version v1.8.4.5; changes since v1.8.4.4: ----------------------------------------- Junio C Hamano (2): submodule: do not copy unknown update mode from .gitmodules Git 1.8.4.5 Richard Hansen (1): remote-hg: don't decode UTF-8 paths into Unicode objects Version v1.8.4.4; changes since v1.8.4.3: ----------------------------------------- Junio C Hamano (2): Revert "upload-pack: send non-HEAD symbolic refs" Git 1.8.4.4 Version v1.8.4.3; changes since v1.8.4.2: ----------------------------------------- Antoine Pelisse (1): remote-hg: unquote C-style paths when exporting Brian Gernhardt (3): t5570: Update for symref capability t5570: Update for clone-progress-to-stderr branch t5570: Update for clone-progress-to-stderr branch Hemmo Nieminen (1): graph: fix coloring around octopus merges Jeff King (11): http_get_file: style fixes http_request: factor out curlinfo_strbuf http: refactor options to http_get_* http: hoist credential request out of handle_curl_result http: provide effective url to callers http: update base URLs when we see redirects remote-curl: make refs_url a strbuf remote-curl: store url as a strbuf remote-curl: rewrite base url from info/refs redirects split_ident: parse timestamp from end of line subtree: add makefile target for html docs Jonathan Nieder (1): t/README: tests can use perl even with NO_PERL Junio C Hamano (10): t5505: fix "set-head --auto with ambiguous HEAD" test upload-pack.c: do not pass confusing cb_data to mark_our_ref() upload-pack: send symbolic ref information as capability upload-pack: send non-HEAD symbolic refs connect.c: make parse_feature_value() static connect: annotate refs with their symref information in get_remote_head() clone: test the new HEAD detection logic revision: do not peel tags used in range notation Start preparing for 1.8.4.3 Git 1.8.4.3 Karsten Blees (1): gitignore.txt: fix documentation of "**" patterns Matthieu Moy (2): checkout: allow dwim for branch creation for "git checkout $branch --" checkout: proper error message on 'git checkout foo bar --' Ramsay Allan Jones (1): http.c: Spell the null pointer as NULL SZEDER Gábor (1): bash prompt: don't use '+=' operator in show upstream code path Sitaram Chamarty (1): doc/howto: warn about (dumb)http server document being too old Vivien Didelot (2): Documentation: restore a space in unpack-objects usage Documentation: "pack-file" is not literal in unpack-objects Version v1.8.4.2; changes since v1.8.4.1: ----------------------------------------- Antoine Pelisse (1): commit: search author pattern against mailmap Christian Couder (1): sha1_file: move comment about return value where it belongs Eric Sunshine (5): rebase -i: fix cases ignoring core.commentchar dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage t3404: make tests more self-contained t3404: rebase -i: demonstrate short SHA-1 collision t3200: fix failure on case-insensitive filesystems Jeff King (8): has_sha1_file: re-check pack directory before giving up upload-pack: send keepalive packets during pack computation upload-pack: bump keepalive default to 5 seconds clone: send diagnostic messages to stderr clone: treat "checking connectivity" like other progress clone: always set transport options shortlog: ignore commits with missing authors format-patch: print in-body "From" only when needed Johan Herland (4): t2024: Fix &&-chaining and a couple of typos t3200: Minor fix when preparing for tracking failure Refer to branch..remote/merge when documenting --track t3200: Add test demonstrating minor regression in 41c21f2 Johannes Sixt (1): add--interactive: fix external command invocation on Windows John Keeping (1): merge-recursive: fix parsing of "diff-algorithm" option Junio C Hamano (8): dir.c: use the cache_* macro to access the current index ls-files -k: a directory only can be killed if the index has a non-directory t3010: update to demonstrate "ls-files -k" optimization pitfalls rebase -i: fix short SHA-1 collision cvsserver: pick up the right mode bits Start preparing for 1.8.4.2 Almost 1.8.4.2 ;-) Git 1.8.4.2 Matthijs Kooijman (1): Add testcase for needless objects during a shallow fetch Nguyễn Thái Ngọc Duy (7): move setup_alternate_shallow and write_shallow_commits to shallow.c shallow: only add shallow graft points to new shallow file shallow: add setup_temporary_shallow() upload-pack: delegate rev walking in shallow fetch to pack-objects list-objects: reduce one argument in mark_edges_uninteresting list-objects: mark more commits as edges in mark_edges_uninteresting Make setup_git_env() resolve .git file when $GIT_DIR is not specified Nicolas Vigier (1): git-merge: document the -S option Per Cederqvist (1): branch.c: Relax unnecessary requirement on upstream's remote ref name Ralf Thielow (2): rebase --preserve-merges: ignore "merge.log" config clone --branch: refuse to clone if upstream repo is empty SZEDER Gábor (1): t4254: modernize tests Steffen Prohaska (1): git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORY Torstein Hegge (1): test-lib: fix typo in comment brian m. carlson (1): http-backend: provide Allow header for 405 Version v1.8.4.1; changes since v1.8.4: --------------------------------------- Andreas Schwab (1): Documentation/git-merge.txt: fix formatting of example block Benoit Person (1): git-remote-mediawiki: bugfix for pages w/ >500 revisions Brandon Casey (3): git-completion.bash: use correct Bash/Zsh array length syntax t9902-completion.sh: old Bash still does not support array+=('') notation contrib/git-prompt.sh: handle missing 'printf -v' more gracefully Jeff King (2): config: do not use C function names as struct members mailmap: handle mailmap blobs without trailing newlines Jharrod LaFon (1): avoid segfault on submodule.*.path set to an empty "true" Johannes Sixt (1): stream_to_pack: xread does not guarantee to read all requested bytes Jonathan Nieder (1): Git 1.8.4.1 Junio C Hamano (6): t5802: add test for connect helper fetch: rename file-scope global "transport" to "gtransport" fetch: refactor code that prepares a transport fetch: refactor code that fetches leftover tags fetch: work around "transport-take-over" hack Start preparing for 1.8.4.1 Kyle J. McKay (3): Git.pm: add new temp_is_locked function git-svn: allow git-svn fetching to work using serf Git.pm: revert _temp_cache use of temp_is_locked Matthieu Moy (2): die_with_status: use "printf '%s\n'", not "echo" rebase: fix run_specific_rebase's use of "return" on FreeBSD Nguyễn Thái Ngọc Duy (1): fetch-pack: do not remove .git/shallow file when --depth is not specified Ralf Thielow (1): l10n: de.po: use "das Tag" instead of "der Tag" Ramsay Allan Jones (1): builtin/fetch.c: Fix a sparse warning Sebastien Helleu (1): l10n: fr.po: hotfix for commit 6b388fc Steffen Prohaska (2): xread, xwrite: limit size of IO to 8MB Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU" Tay Ray Chuan (1): t7406-submodule-update: add missing && Thomas Rast (2): log: use true parents for diff even when rewriting log: use true parents for diff when walking reflogs Thorsten Glaser (1): fix shell syntax error in template brian m. carlson (1): send-email: don't call methods on undefined values Version v1.8.4; changes since v1.8.4-rc4: ----------------------------------------- Junio C Hamano (2): Typofix draft release notes to 1.8.4 Git 1.8.4 Version v1.8.4-rc4; changes since v1.8.4-rc3: --------------------------------------------- Junio C Hamano (3): Revert "git stash: avoid data loss when "git stash save" kills a directory" Revert "Add new @ shortcut for HEAD" Git 1.8.4-rc4 Version v1.8.4-rc3; changes since v1.8.4-rc2: --------------------------------------------- Eric Sunshine (1): parse-options: fix clang opterror() -Wunused-value warning Jean-Noel Avila (2): l10n: fr.po: 821/2112 messages translated l10n: Add reference for french translation team Jiang Xin (2): l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed) l10n: zh_CN.po: translate 5 messages (2135t0f0u) Junio C Hamano (2): .mailmap: update long-lost friends with multiple defunct addresses Git 1.8.4-rc3 Matthieu Moy (1): git-remote-mediawiki: ignore generated git-mw Peter Krefting (1): l10n: Update Swedish translation (2135t0f0u) Phil Hord (1): t/t7407: fix two typos in submodule tests Ralf Thielow (3): l10n: de.po: switch from pure German to German+English l10n: de.po: translate 99 new messages l10n: de.po: translate 5 messages Stefan Beller (2): .mailmap: fixup entries .mailmap: Combine more (name, email) to individual persons Tran Ngoc Quan (1): l10n: vi.po(2135t): v1.8.4 round 2 Wieland Hoffmann (1): l10n: de.po: Fix a typo Version v1.8.4-rc2; changes since v1.8.4-rc1: --------------------------------------------- Felix Gruber (1): fix typo in documentation of git-svn Jiang Xin (2): l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed) l10n: zh_CN.po: translate 99 messages (2133t0f0u) Jonathan Nieder (1): log doc: the argument to --encoding is not optional Junio C Hamano (4): Revert "cat-file: split --batch input lines on whitespace" t3900: test rejecting log message with NULs correctly commit: typofix for xxFFF[EF] check Git 1.8.4-rc2 Ramsay Allan Jones (1): cygwin: Remove the Win32 l/stat() implementation René Scharfe (1): t8001, t8002: fix "blame -L :literal" test on NetBSD Stefan Beller (1): .mailmap: Multiple addresses of Michael S. Tsirkin Torstein Hegge (1): Documentation/rev-list-options: add missing word in --*-parents Tran Ngoc Quan (1): l10n: vi.po (2133t) brian m. carlson (1): Add missing test file for UTF-16. Version v1.8.4-rc1; changes since v1.8.4-rc0: --------------------------------------------- Brandon Casey (1): git-completion.bash: replace zsh notation that breaks bash 3.X Daniele Segato (1): docs/git-tag: explain lightweight versus annotated tags Jeff King (6): docs: fix 'report-status' protocol capability thinko docs: note that receive-pack knows side-band-64k capability document 'agent' protocol capability document 'quiet' receive-pack capability commit.h: drop redundant comment commit: tweak empty cherry pick advice for sequencer Jiang Xin (2): Documentation/git-clean: fix description for range git-clean: implement partial matching for selection Junio C Hamano (2): builtin/rm.c: consolidate error reporting for removing submodules Git 1.8.4-rc1 Lukas Fleischer (1): Avoid using `echo -n` anywhere Maurício C Antunes (1): hg-to-git: --allow-empty-message in git commit Michael Haggerty (1): do_one_ref(): save and restore value of current_ref Michal Sojka (1): contrib/subtree: Fix make install target Nguyễn Thái Ngọc Duy (1): document 'allow-tip-sha1-in-want' capability Ondřej Bílka (1): many small typofixes Ralf Thielow (1): git-rebase: fix typo Ramkumar Ramachandra (1): config doc: quote paths, fixing tilde-interpretation Ramsay Allan Jones (1): commit-slab.h: Fix memory allocation and addressing Stefan Beller (1): .mailmap: combine more (email, name) to individual persons Thomas Rast (1): Rename advice.object_name_warning to objectNameWarning Version v1.8.4-rc0; changes since v1.8.3.4: ------------------------------------------- Adam Spiers (6): t0008: remove duplicated test fixture data check-ignore: add -n / --non-matching option check-ignore: move setup into cmd_check_ignore() check-ignore: allow incremental streaming of queries via --stdin Documentation: add caveats about I/O buffering for check-{attr,ignore} t0008: use named pipe (FIFO) to test check-ignore streaming Alexey Shumkin (10): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): don't hardcode SHA-1 in expected outputs t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs pretty: Add failing tests: --format output should honor logOutputEncoding pretty: --format output should honor logOutputEncoding t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1 t4205 (log-pretty-formats): revert back single quotes t4205, t6006, t7102: make functions better readable t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set t4205 (log-pretty-formats): avoid using `sed` Andrew Pimlott (2): rebase -i: handle fixup! fixup! in --autosquash lib-rebase: style: use write_script, <<-\EOF Andrew Wong (1): git add -e: Explicitly specify that patch should have no color Antoine Pelisse (1): diff: add --ignore-blank-lines option Arnaud Fontaine (1): Do not ignore merge options in interactive rebase Benoit Person (9): git-remote-mediawiki: use Git.pm functions for credentials git-remote-mediawiki: remove hardcoded version number in the test suite git-remote-mediawiki: introduction of Git::Mediawiki.pm wrap-for-bin: make bin-wrappers chainable git-remote-mediawiki: add a git bin-wrapper for developement git-remote-mediawiki: update tests to run with the new bin-wrapper git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki git-remote-mediawiki: add git-mw command git-remote-mediawiki: add preview subcommand into git mw Benoit Sigoure (1): Revert "compat/unsetenv.c: Fix a sparse warning" Bo Yang (2): Refactor parse_loc Export rewrite_parents() for 'log -L' Brandon Casey (3): builtin/checkout.c: don't leak memory in check_tracking_name t/t9802: explicitly name the upstream branch to use as a base remote.c: avoid O(m*n) behavior in match_push_refs Brian Gernhardt (1): t4205: replace .\+ with ..* in sed commands Chris Packham (1): submodule update: allow custom command to update submodule working tree Christian Couder (1): Makefile: replace "echo 1>..." with "echo >..." Célestin Matte (32): git-remote-mediawiki: display message when launched directly git-remote-mediawiki: make a regexp clearer git-remote-mediawiki: move "use warnings;" before any instruction git-remote-mediawiki: replace :utf8 by :encoding(UTF-8) git-remote-mediawiki: always end a subroutine with a return git-remote-mediawiki: move a variable declaration at the top of the code git-remote-mediawiki: change syntax of map calls git-remote-mediawiki: rewrite unclear line of instructions git-remote-mediawiki: remove useless regexp modifier (m) git-remote-mediawiki: change the behaviour of a split git-remote-mediawiki: change separator of some regexps git-remote-mediawiki: change style in a regexp git-remote-mediawiki: change style in a regexp git-remote-mediawiki: add newline in the end of die() error messages git-remote-mediawiki: change the name of a variable git-remote-mediawiki: turn double-negated expressions into simple expressions git-remote-mediawiki: remove unused variable $entry git-remote-mediawiki: rename a variable ($last) which has the name of a keyword git-remote-mediawiki: assign a variable as undef and make proper indentation git-remote-mediawiki: check return value of open git-remote-mediawiki: remove import of unused open2 git-remote-mediawiki: put long code into a subroutine git-remote-mediawiki: modify strings for a better coding-style git-remote-mediawiki: brace file handles for print for more clarity git-remote-mediawiki: replace "unless" statements with negated "if" statements git-remote-mediawiki: don't use quotes for empty strings git-remote-mediawiki: put non-trivial numeric values in constants. git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki") git-remote-mediawiki: clearly rewrite double dereference git-remote-mediawiki: add a .perlcriticrc file git-remote-mediawiki: add a perlcritic rule in Makefile git-remote-mediawiki: make error message more precise Dale R. Worley (1): git_mkstemps: correctly test return value of open() Dirk Wallenstein (1): request-pull: improve error message for invalid revision args Doug Bell (1): show-ref: make --head always show the HEAD ref Eduardo R. D'Avila (5): t9903: add tests for git-prompt pcmode git-prompt.sh: refactor colored prompt code t9903: remove redundant tests git-prompt.sh: do not print duplicate clean color code git-prompt.sh: add missing information in comments Eric Sunshine (27): t4211: fix broken test when one -L range is subset of another range_set: fix coalescing bug when range is a subset of another builtin: add git-check-mailmap command t4203: test check-mailmap command invocation t4203: demonstrate loss of single-character name in mailmap entry t4203: demonstrate loss of uppercase characters in canonical email mailmap: debug: fix out-of-order fprintf() arguments mailmap: debug: fix malformed fprintf() format conversion specification mailmap: debug: eliminate -Wformat field precision type warning mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification git-log.txt: fix typesetting of example "git-log -L" invocation line-range: fix "blame -L X,-N" regression t8001/t8002 (blame): modernize style t8001/t8002 (blame): add blame -L tests t8001/t8002 (blame): add blame -L :funcname tests blame-options.txt: place each -L option variation on its own line blame-options.txt: explain that -L and are optional contrib: add git-contacts helper contrib: contacts: add ability to parse from committish contrib: contacts: interpret committish akin to format-patch contrib: contacts: add mailmap support contrib: contacts: add documentation range-set: fix sort_and_merge_range_set() corner case bug t4211: demonstrate empty -L range crash t4211: demonstrate crash when first -L encountered is empty range range-set: satisfy non-empty ranges invariant line-log: fix "log -LN" crash when N is last line of file Felipe Contreras (108): transport-helper: report errors properly transport-helper: improve push messages transport-helper: clarify *:* refspec transport-helper: update refspec documentation transport-helper: clarify pushing without refspecs transport-helper: warn when refspec is not used transport-helper: trivial code shuffle transport-helper: update remote helper namespace completion: add file completion tests completion: document tilde expansion failure in tests completion; remove unuseful comments completion: use __gitcompadd for __gitcomp_file completion: refactor diff_index wrappers completion: refactor __git_complete_index_file() completion: add hack to enable file mode in bash < 4 completion: add space after completed filename completion: remove __git_index_file_list_filter() fast-export: do not parse non-commit objects while reading marks file fast-export: don't parse commits while reading marks file fast-{import,export}: use get_sha1_hex() to read from marks file tests: at-combinations: simplify setup tests: at-combinations: check ref names directly tests: at-combinations: improve nonsense() sha1_name: remove no-op sha1_name: remove unnecessary braces completion: cleanup zsh wrapper completion: synchronize zsh wrapper sha1_name: reorganize get_sha1_basic() sha1_name: refactor reinterpret() Add new @ shortcut for HEAD sha1_name: compare variable with constant, not constant with variable test: remote-helper: add missing and transport-helper: fix remote helper namespace regression transport-helper: barf when user tries old:new transport-helper: check if the dry-run is supported remote-helpers: tests: use python directly remote-hg: tests: fix hg merge build: trivial simplification build: cleanup using $^ build: cleanup using $< build: add NO_INSTALL variable build: do not install git-remote-testpy remote-bzr: recover from failed clones remote-bzr: fix for files with spaces remote-bzr: simplify get_remote_branch() remote-bzr: delay cloning/pulling remote-bzr: change global repo remote-bzr: trivial cleanups remote-bzr: reorganize the way 'wanted' works remote-bzr: add fallback check for a partial clone remote-hg: test: be a little more quiet remote-hg: trivial reorganization remote-helpers: test: cleanup white-spaces remote-helpers: test: cleanup style remote-helpers: tests: general improvements remote-helpers: test: simplify remote URLs remote-hg: test: simplify previous branch checkout remote-hg: load all extensions remote-hg: use a shared repository store remote-hg: shuffle some code remote-hg: improve node traversing remote-hg: add version checks to the marks remote-hg: switch from revisions to SHA-1 noteids remote-hg: upgrade version 1 marks remote-hg: ensure remote rebasing works remote-hg: trivial cleanups remote-hg: improve progress calculation remote-hg: always point HEAD to master remote-hg: add tests for 'master' bookmark remote-bzr: simplify test checks remote-hg: add check_bookmark() test helper remote-hg: update bookmarks when using a remote remote-hg: add remote tests remote-hg: add test to push new bookmark remote-hg: add test for diverged push remote-hg: add test for bookmark diverge remote-hg: add test for new bookmark special remote-hg: add test for big push remote-hg: add test for failed double push remote-hg: reorganize bookmark handling remote-hg: force remote bookmark push selectively remote-hg: only update necessary revisions remote-hg: implement custom push() remote-hg: implement custom checkheads() remote-hg: pass around revision refs remote-hg: check diverged bookmarks remote-hg: simplify branch_tip() remote-hg: improve branch listing remote-hg: use remote 'default' not local one remote-hg: improve lightweight tag author remote-hg: remove files before modifications remote-hg: add setup_big_push() helper remote-hg: add check_push() helper remote-helpers: improve marks usage remote-hg: trivial cleanup remote-hg: check if a fetch is needed remote-hg: add support for --dry-run remote-hg: add support for --force remote: trivial style cleanup test: trivial cleanups test: rebase: fix --interactive test send-email: remove warning about unset chainreplyto completion: zsh: improve bash script loading completion: avoid ls-remote in certain scenarios test: fix post rewrite hook report build: generate and clean test scripts build: do not install git-remote-testgit Makefile: use $^ to avoid listing prerequisites on the command line Fredrik Gustafsson (2): git-submodule.sh: remove duplicate call to set_rev_name Add --depth to submodule update/add Grahack (1): French translation: copy -> copie. Heiko Voigt (6): git-gui: allow "\ No newline at end of file" for linewise staging config: factor out config file stack management config: drop cf validity check in get_next_char() config: make parsing stack struct independent from actual data source teach config --blob option to parse config from database do not die when error in config parsing of buf occurs Jeff King (40): transport-helper: mention helper name when it dies commit: allow associating auxiliary info on-demand lookup_object: prioritize recently found objects t5510: start tracking-ref tests from a known state refactor "ref->merge" flag fetch: opportunistically update tracking refs t0005: test git exit code from signal death contrib: drop blameview/ directory t5303: drop "count=1" from corruption dd unpack_entry: do not die when we fail to apply a delta get_packed_ref_cache: reload packed-refs file when it changes for_each_ref: load all loose refs before packed refs transport-helper: be quiet on read errors from helpers fetch-pack: avoid quadratic list insertion in mark_complete commit.c: make compare_commits_by_commit_date global fetch-pack: avoid quadratic behavior in rev_list_push pretty.c: drop const-ness from pretty_print_context teach format-patch to place other authors into in-body "From" zero-initialize object_info structs teach sha1_object_info_extended a "disk_size" query clone: drop connectivity check for local clones add missing "format" function attributes use "sentinel" function attribute for variadic lists wt-status: use "format" function attribute for status_printf t1006: modernize output comparisons cat-file: teach --batch to stream blob objects cat-file: refactor --batch option parsing cat-file: add --batch-check= cat-file: add %(objectsize:disk) format atom cat-file: split --batch input lines on whitespace pack-revindex: use unsigned to store number of objects pack-revindex: radix-sort the revindex t0008: avoid SIGPIPE race condition on fifo cat-file: disable object/refname ambiguity check for batch mode sha1_object_info_extended: rename "status" to "type" sha1_loose_object_info: make type lookup optional packed_object_info: hoist delta type resolution to helper packed_object_info: make type lookup optional sha1_object_info_extended: make type calculation optional sha1_object_info_extended: pass object_info to helpers Jiang Xin (16): test: add test cases for relative_path path.c: refactor relative_path(), not only strip prefix quote.c: substitute path_relative with relative_path quote_path_relative(): remove redundant parameter write_name{_quoted_relative,}(): remove redundant parameters git-clean: refactor git-clean into two phases git-clean: add support for -i/--interactive git-clean: show items of del_list in columns git-clean: add colors to interactive git-clean git-clean: use a git-add-interactive compatible UI git-clean: add filter by pattern interactive action git-clean: add select by numbers interactive action git-clean: add ask each interactive action git-clean: add documentation for interactive git-clean test: add t7301 for git-clean--interactive test: run testcases with POSIX absolute paths on Windows Johan Herland (3): finish_copy_notes_for_rewrite(): Let caller provide commit message Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c Move create_notes_commit() from notes-merge.c into notes-utils.c Johannes Schindelin (2): Define NO_GETTEXT for Git for Windows Windows resource: handle dashes in the Git version gracefully Johannes Sixt (4): git-remote-testgit: avoid process substitution git-remote-testgit: further remove some bashisms t0005: skip signal death exit code test on Windows rebase topology tests: fix commit names on case-insensitive file systems John Keeping (20): t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY test output: respect $TEST_OUTPUT_DIRECTORY t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively fetch: don't try to update unfetched tracking refs git-gui: fix file name handling with non-empty prefix add--interactive: respect diff.algorithm Documentation/Makefile: fix spaces around assignments Documentation/Makefile: move infodir to be with other '*dir's mergetool--lib: refactor {diff,merge}_cmd logic t7401: make indentation consistent t7403: modernize style t7403: add missing && chaining submodule: show full path in error message rev-parse: add --prefix option submodule: drop the top-level requirement completion: handle unstuck form of base git options completion: learn about --man-path git-config(1): clarify precedence of multiple values push: avoid suggesting "merging" remote changes pull: change the description to "integrate" changes Jonathan Nieder (1): mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE Jonathon Mah (2): Documentation: remove --prune from pack-refs examples Documentation: fix git-prune example usage Jorge Juan Garcia Garcia (4): status: introduce status.short to enable --short by default status: introduce status.branch to enable --branch by default status: introduce status.short to enable --short by default status: introduce status.branch to enable --branch by default Junio C Hamano (56): commit-slab: avoid large realloc date.c: add parse_expiry_date() line-log: fix documentation formatting t5801: "VAR=VAL shell_func args" is forbidden prune: introduce OPT_EXPIRY_DATE() and use it git-remote-testgit: build it to run under $SHELL_PATH t6111: allow checking the parents as well t6012: update test for tweaked full-history traversal Start 1.8.4 cycle Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 commit-slab: introduce a macro to define a slab for new type test: test_must_be_empty helper Update draft release notes toposort: rename "lifo" field prio-queue: priority queue of pointers to structs sort-in-topological-order: use prio-queue log: --author-date-order Update draft release notes to 1.8.4 t7512: test "detached from" as well Update draft release notes to 1.8.4 t/lib-t6000: style fixes topology tests: teach a helper to take abbreviated timestamps t6003: add --date-order test topology tests: teach a helper to set author dates as well t6003: add --author-date-order test add -i: add extra options at the right place in "diff" command line Update draft release notes to 1.8.4 Revert "Merge branch 'jg/status-config'" status/commit: make sure --porcelain is not affected by user-facing config Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 treat_directory(): do not declare submodules to be untracked name-ref: factor out name shortening logic from name_ref() name-rev: allow converting the exact object name at the tip of a ref describe: use argv-array remote-http: use argv-array Update draft release notes to 1.8.4 Update draft release notes for 1.8.4 mailmap: do not lose single-letter names mailmap: do not downcase mailmap entries mailmap: style fixes Revert "git-clone.txt: remove the restriction on pushing from a shallow clone" Update draft release notes to 1.8.4 Update draft release notes to 1.8.4 name-rev: differentiate between tags and commits they point at describe: fix --contains when a tag is given as input t2202: make sure "git add" (no args) stays a no-op Update draft release notes to 1.8.4 t7600: fix typo in test title t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant) Git 1.8.4-rc0 Kevin Bracey (14): decorate.c: compact table when growing t6019: test file dropped in -s ours merge t6111: new TREESAME test set t6111: add parents to tests rev-list-options.txt: correct TREESAME for P Documentation: avoid "uninteresting" revision.c: Make --full-history consider more merges simplify-merges: never remove all TREESAME parents simplify-merges: drop merge from irrelevant side branch revision.c: add BOTTOM flag for commits revision.c: discount side branches when computing TREESAME revision.c: don't show all merges for --parents revision.c: make default history consider bottom commits am: replace uses of --resolved with --continue Kirill Smelkov (1): git-gui: Fix parsing of Mark Levedahl (6): test-lib.sh - cygwin does not have usable FIFOs test-lib.sh - define and use GREP_STRIPS_CR Cygwin 1.7 needs compat/regex Cygwin 1.7 has thread-safe pread Cygwin 1.7 supports mmap cygwin: stop forcing core.filemode=false Martin von Zweigbergk (7): add simple tests of consistency across rebase types add tests for rebasing with patch-equivalence present add tests for rebasing of empty commits add tests for rebasing root add tests for rebasing merged history t3406: modernize style tests: move test for rebase messages from t3400 to t3406 Mathieu Lienard--Mayor (2): rm: better error message on failure for multiple files rm: introduce advice.rmHints to shorten messages Matthieu Moy (10): config: refactor management of color.ui's default value git-remote-mediawiki: better error message when HTTP(S) access fails make color.ui default to 'auto' git-remote-mediawiki: un-brace file handles in binmode calls t4000-diff-format.sh: modernize style diff: allow --no-patch as synonym for -s diff: allow --patch & cie to override -s/--no-patch Documentation/git-show.txt: include common diff options, like git-log.txt Documentation: move description of -s, --no-patch to diff-options.txt Documentation/git-log.txt: capitalize section names Matthijs Kooijman (1): upload-pack: remove a piece of dead code Michael Haggerty (75): git-gc.txt, git-reflog.txt: document new expiry options api-parse-options.txt: document "no-" for non-boolean options refs: document flags constants REF_* refs: document the fields of struct ref_value refs: document do_for_each_ref() and do_one_ref() refs: document how current_ref is used refs: define constant PEELED_LINE_LENGTH do_for_each_ref_in_dirs(): remove dead code get_packed_ref(): return a ref_entry peel_ref(): use function get_packed_ref() repack_without_ref(): use function get_packed_ref() refs: extract a function ref_resolves_to_object() refs: extract function peel_object() peel_object(): give more specific information in return value peel_ref(): fix return value for non-peelable, not-current reference refs: extract a function peel_entry() refs: change the internal reference-iteration API t3210: test for spurious error messages for dangling packed refs repack_without_ref(): silence errors for dangling packed refs search_ref_dir(): return an index rather than a pointer refs: change how packed refs are deleted t3211: demonstrate loss of peeled refs if a packed ref is deleted repack_without_ref(): write peeled refs in the rewritten file refs: extract a function write_packed_entry() pack-refs: rename handle_one_ref() to pack_one_ref() pack-refs: merge code from pack-refs.{c,h} into refs.{c,h} pack_one_ref(): rename "path" parameter to "refname" refs: use same lock_file object for both ref-packing functions pack_refs(): change to use do_for_each_entry() refs: inline function do_not_prune() pack_one_ref(): use function peel_entry() pack_one_ref(): use write_packed_entry() to do the writing pack_one_ref(): do some cheap tests before a more expensive one refs: change do_for_each_*() functions to take ref_cache arguments refs: handle the main ref_cache specially describe: make own copy of refname fetch: make own copies of refnames add_rev_cmdline(): make a copy of the name argument builtin_diff_tree(): make it obvious that function wants two entries cmd_diff(): use an object_array for holding trees cmd_diff(): rename local variable "list" -> "entry" cmd_diff(): make it obvious which cases are exclusive of each other revision: split some overly-long lines object_array: add function object_array_filter() revision: use object_array_filter() in implementation of gc_boundary() object_array_remove_duplicates(): rewrite to reduce copying fsck: don't put a void*-shaped peg in a char*-shaped hole find_first_merges(): initialize merges variable using initializer find_first_merges(): remove unnecessary code object_array_entry: fix memory handling of the name field do_fetch(): reduce scope of peer_item do_fetch(): clean up existing_refs before exiting add_existing(): do not retain a reference to sha1 show_head_ref(): do not shadow name of argument show_head_ref(): rename first parameter to "refname" string_list_add_one_ref(): rename first parameter to "refname" string_list_add_refs_by_glob(): add a comment about memory management exclude_existing(): set existing_refs.strdup_strings register_ref(): make a copy of the bad reference SHA-1 refs: document the lifetime of the args passed to each_ref_fn resolve_ref_unsafe(): extract function handle_missing_loose_ref() resolve_ref_unsafe(): handle the case of an SHA-1 within loop resolve_ref_unsafe(): close race condition reading loose refs repack_without_ref(): split list curation and entry writing pack_refs(): split creation of packed refs and entry writing refs: wrap the packed refs cache in a level of indirection refs: implement simple transactions for the packed-refs file refs: manage lifetime of packed refs cache via reference counting do_for_each_entry(): increment the packed refs cache refcount packed_ref_cache: increment refcount when locked Extract a struct stat_data from cache_entry add a stat_validity struct refs: do not invalidate the packed-refs cache unnecessarily git-multimail: an improved replacement for post-receive-email post-receive-email: deprecate script in favor of git-multimail Michael Schubert (1): Change "remote tracking" to "remote-tracking" Mike Crowe (1): describe: Add --first-parent option Miklos Vajna (1): merge: handle --ff/--no-ff/--ff-only as a tri-state option Namhyung Kim (1): name-rev: allow to specify a subpath for --refs option Nguyễn Thái Ngọc Duy (10): clone: allow cloning local paths with colons in them index-pack: remove dead code (it should never happen) clone: open a shortcut for connectivity check prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects() get_sha1: warn about full or short object names that look like refs Makefile: promote wildmatch to be the default fnmatch implementation core: use env variable instead of config var to turn on logging pack access git.txt: document GIT_TRACE_PACKET Convert "struct cache_entry *" to "const ..." wherever possible git-clone.txt: remove the restriction on pushing from a shallow clone Ondřej Bílka (3): typofix: release notes typofix: documentation typofix: in-code comments Pat Thoyts (7): git-gui: fix the mergetool launcher for the Beyond Compare tool. git-gui: change dialog button positions for Windows to suit platform. Provide a Windows version resource for the git executables. Ensure the resource file is rebuilt when the version changes. Set the default help format to html for msys builds. git-gui: avoid an error message when removing the last remote git-gui 0.18 Peter Krefting (1): commit: reject non-characters Petr Baudis (1): git stash: avoid data loss when "git stash save" kills a directory Pierre le Riche (1): msysgit: Add the --large-address-aware linker directive to the makefile. Ralf Thielow (1): wt-status: give better advice when cherry-pick is in progress Ramkumar Ramachandra (54): tests: at-combinations: increase coverage tests: at-combinations: @{N} versus HEAD@{N} sha1_name: don't waste cycles in the @-parsing loop sha1_name: check @{-N} errors sooner am: tighten a conditional that checks for $dotest rebase -i: don't error out if $state_dir already exists rebase: prepare to do generic housekeeping am: return control to caller, for housekeeping rebase -i: return control to caller, for housekeeping rebase --merge: return control to caller, for housekeeping prompt: introduce GIT_PS1_STATESEPARATOR prompt: factor out gitstring coloring logic prompt: colorize ZSH prompt rebase: implement --[no-]autostash and rebase.autostash contrib: remove continuous/ and patches/ completion: difftool takes both revs and files completion: show can take both revlist and paths rebase: guard against missing files in read_basic_state() rebase: finish_rebase() in fast-forward rebase rebase: finish_rebase() in noop rebase prompt: squelch error output from cat t/rebase: add failing tests for a peculiar revision sh-setup: add new peel_committish() helper rebase: use peel_committish() where appropriate am: handle stray $dotest directory t/am: use test_path_is_missing() where appropriate stash doc: add a warning about using create stash doc: document short form -p in synopsis stash: simplify option parser for create wt-status: remove unused field in grab_1st_switch_cbdata t/t2021-checkout-last: "checkout -" should work after a rebase finishes status: do not depend on rebase reflog messages checkout: respect GIT_REFLOG_ACTION stash: introduce 'git stash store' rebase: use 'git stash store' to simplify logic sequencer: write useful reflog message for fast-forward t/t5528-push-default: remove redundant test_config lines t/t5505-remote: modernize style t/t5505-remote: test push-refspec in branches-file t/t5505-remote: use test_path_is_missing remote: remove dead code in read_branches_file() t/t5505-remote: test url-with-# in branches-file ls-remote doc: fix example invocation on git.git ls-remote doc: rewrite paragraph ls-remote doc: don't encourage use of branches-file t/t5505-remote: test multiple push/pull in remotes-file config doc: rewrite push.default section rebase: use a better reflog message rebase -i: use a better reflog message push: change `simple` to accommodate triangular workflows t/t5528-push-default: generalize test_push_* t/t5528-push-default: test pushdefault workflows commit: make it work with status.short send-email: be explicit with SSL certificate verification Ramsay Allan Jones (14): compat/regex/regexec.c: Fix some sparse warnings compat/fnmatch/fnmatch.c: Fix a sparse error compat/nedmalloc: Fix some sparse warnings compat/nedmalloc: Fix compiler warnings on linux compat/unsetenv.c: Fix a sparse warning compat/win32/pthread.c: Fix a sparse warning compat/poll/poll.c: Fix a sparse warning compat/win32mmap.c: Fix some sparse warnings compat/mingw.c: Fix some sparse warnings sparse: Fix mingw_main() argument number/type errors cygwin: Remove the CYGWIN_V15_WIN32API build variable path: Fix a sparse warning Fix some sparse warnings Add the LAST_ARG_MUST_BE_NULL macro René Scharfe (11): cache: mark cache_entry pointers const read-cache: mark cache_entry pointers const unpack-trees: factor out dup_entry unpack-trees: create working copy of merge entry in merged_entry diff-lib, read-tree, unpack-trees: mark cache_entry pointers const diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const unpack-trees: free cache_entry array members for merges match-trees: factor out fill_tree_desc_strict unpack-trees: don't shift conflicts left and right diffcore-pickaxe: simplify has_changes and contains .mailmap: René Scharfe has a new email address Richard Hartmann (3): templates: Use heredoc in pre-commit hook templates: Reformat pre-commit hook's message templates: spell ASCII in uppercase in pre-commit hook SZEDER Gábor (16): bash prompt: fix redirection coding style in tests bash prompt: use 'write_script' helper in interactive rebase test completion, bash prompt: move __gitdir() tests to completion test suite bash prompt: add a test for symbolic link symbolic refs bash prompt: print unique detached HEAD abbreviated object name bash prompt: return early from __git_ps1() when not in a git repository bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir() bash prompt: use bash builtins to find out rebase state bash prompt: use bash builtins to find out current branch bash prompt: combine 'git rev-parse' executions in the main code path bash prompt: combine 'git rev-parse' for detached head bash prompt: use bash builtins to check for unborn branch for dirty state bash prompt: use bash builtins to check stash state bash prompt: avoid command substitution when checking for untracked files bash prompt: avoid command substitution when finalizing gitstring bash prompt: mention that PROMPT_COMMAND mode is faster Sebastian Schuberth (1): Makefile: Do not use OLD_ICONV on MINGW anymore Slava Kardakov (1): Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist Stefan Beller (10): .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand" .mailmap: Map email addresses to names .mailmap: Combine more (email, name) to individual persons daemon.c:handle: Remove unneeded check for null pointer. commit: Fix a memory leak in determine_author_info diff.c: Do not initialize a variable, which gets reassigned anyway. parse_object_buffer: correct freeing the buffer .mailmap: combine more (email, name) to individual persons traverse_trees(): clarify return value of the callback open_istream: remove unneeded check for null pointer Stefan Haller (1): git-gui: bring wish process to front on Mac Thomas Gummerer (1): perf-lib: fix start/stop of perf tests Thomas Rast (25): Implement line-history search (git log -L) log -L: :pattern:file syntax to find by funcname Speed up log -L... -M log -L: check range set invariants when we look it up log -L: fix overlapping input ranges t4211: pass -M to 'git log -M -L...' test log -L: test merge of parallel modify/rename log -L: store the path instead of a diff_filespec log -L: improve comments in process_all_files() git-log(1): remove --full-line-diff description fetch/pull doc: untangle meaning of bare sha1_file: silence sha1_loose_object_info test-lib: enable MALLOC_* for the actual tests test-lib: refactor $GIT_SKIP_TESTS matching test-lib: rearrange start/end of test_expect_* and test_skip test-lib: self-test that --verbose works test-lib: verbose mode for only tests matching a pattern test-lib: valgrind for only tests matching a pattern test-lib: allow prefixing a custom string before "ok N" etc. test-lib: support running tests under valgrind in parallel run-command: dup_devnull(): guard against syscalls failing daemon/shell: refactor redirection of 0/1/2 from /dev/null git: ensure 0/1/2 are open in main() apply, entry: speak of submodules instead of subprojects show-branch: fix description of --date-order Tony Finch (1): gitweb: allow extra breadcrumbs to prefix the trail Torsten Bögershausen (1): t0000: do not use export X=Y W. Trevor King (4): doc/clone: Remove the '--bare -l -s' example doc/clone: Pick more compelling paths for the --reference example Documentation: Update the NFS remote examples to use the staging repo Documentation: Update 'linux-2.6.git' -> 'linux.git' Xidorn Quan (1): credential-osxkeychain: support more protocols brian m. carlson (3): send-email: provide port separately from hostname commit: reject invalid UTF-8 codepoints commit: reject overlong UTF-8 sequences Version v1.8.3.4; changes since v1.8.3.3: ----------------------------------------- Dennis Kaarsemaker (2): tests: allow sha1's as part of the path GIT-VERSION-GEN: support non-standard $GIT_DIR path Fraser Tweedale (2): documentation: add git:// transport security notice diff-options: document default similarity index Jeff King (5): t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 t/lib-httpd/apache.conf: load compat access module in apache 2.4 t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 lib-httpd/apache.conf: check version only after mod_version loads Johannes Sixt (10): test-chmtime: Fix exit code on Windows t3010: modernize style tests: introduce test_ln_s_add tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) t0000: use test_ln_s_add to remove SYMLINKS prerequisite t3030: use test_ln_s_add to remove SYMLINKS prerequisite t3100: use test_ln_s_add to remove SYMLINKS prerequisite t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite t6035: use test_ln_s_add to remove SYMLINKS prerequisite t4011: remove SYMLINKS prerequisite Junio C Hamano (7): fetch-options.txt: prevent a wildcard refspec from getting misformatted diff: demote core.safecrlf=true to core.safecrlf=warn t1512: correct leftover constants from earlier edition get_short_sha1(): correctly disambiguate type-limited abbreviation Start preparing for 1.8.3.4 Update draft release notes to 1.8.3.4 Git 1.8.3.4 Kevin Bracey (1): Documentation: Move "git diff " Matthieu Moy (2): Documentation/git-push.txt: explain better cases where --force is dangerous Documentation/git-merge.txt: weaken warning about uncommited changes Michael Haggerty (1): lockfile: fix buffer overflow in path handling Namhyung Kim (1): config: Add description of --local option Ondřej Bílka (1): update URL to the marc.info mail archive Phil Hord (1): fix "builtin-*" references to be "builtin/*" Ramkumar Ramachandra (2): column doc: rewrite documentation for column.ui name-rev doc: rewrite --stdin paragraph René Scharfe (9): t5000: integrate export-subst tests into regular tests t5000, t5003: create directories for extracted files lazily t5000: factor out check_tar t5000: use check_tar for prefix test t5000: simplify tar-tree tests t5000: test long filenames read-cache: add simple performance test read-cache: free cache in discard_index use logical OR (||) instead of binary OR (|) in logical context Stefan Beller (4): archive-zip:write_zip_entry: Remove second reset of size variable to zero. Documentation: "git reset " takes a tree-ish, not tree-sh http-push.c::add_send_request(): do not initialize transfer_request apply.c::find_name_traditional(): do not initialize len to the line's length Thomas Rast (7): coverage: split build target into compile and test coverage: do not delete .gcno files before building coverage: set DEFAULT_TEST_TARGET to avoid using prove coverage: build coverage-untested-functions by default Test 'commit --only' after 'checkout --orphan' t9902: fix 'test A == B' to use = operator test-lint: detect 'export FOO=bar' Torstein Hegge (1): bisect: Fix log output for multi-parent skip ranges Veres Lajos (1): random typofixes (committed missing a 't', successful missing an 's') Vitor Antunes (1): t9801: git-p4: check ignore files with client spec W. Trevor King (1): user-manual: Update download size for Git and the kernel Yaakov Selkowitz (1): web--browse: support /usr/bin/cygstart on Cygwin Version v1.8.3.3; changes since v1.8.3.2: ----------------------------------------- Andrew Pimlott (2): lib-rebase: document exec_ in FAKE_LINES t7500: fix flipped actual/expect Anthony Ramine (1): wildmatch: properly fold case everywhere Brandon Casey (1): http.c: don't rewrite the user:passwd string multiple times Charles McGarvey (1): gitweb: fix problem causing erroneous project list Chris Rorvick (1): git.txt: remove stale comment regarding GIT_WORK_TREE Clemens Buchacher (1): fix segfault with git log -c --follow David Aguilar (4): Makefile: fix default regex settings on Darwin Makefile: add support for Apple CommonCrypto facility cache.h: eliminate SHA-1 deprecation warnings on Mac OS X imap-send: eliminate HMAC deprecation warnings on Mac OS X Dmitry Marakasov (1): contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash Felipe Contreras (4): read-cache: fix wrong 'the_index' usage read-cache: trivial style cleanups sequencer: remove useless indentation sequencer: avoid leaking message buffer when refusing to create an empty commit Filipe Cabecinhas (1): compate/clipped-write.c: large write(2) fails on Mac OS X/XNU Fredrik Gustafsson (1): handle multibyte characters in name Jeff King (1): pull: update unborn branch tip after index John Keeping (1): git-config: update doc for --get with multiple values Junio C Hamano (6): deprecate core.statinfo at Git 2.0 boundary t5551: do not use unportable sed '\+' Documentation/diff-index: mention two modes of operation Start preparing for 1.8.3.3 Update draft release notes to 1.8.3.3 Git 1.8.3.3 Michael S. Tsirkin (9): t/send-email.sh: add test for suppress-cc=self send-email: fix suppress-cc=self on cccmd t/send-email: test suppress-cc=self on cccmd send-email: make --suppress-cc=self sanitize input t/send-email: add test with quoted sender t/send-email: test suppress-cc=self with non-ascii test-send-email: test for pre-sanitized self name send-email: add test for duplicate utf8 name send-email: sanitize author when writing From line Ramkumar Ramachandra (6): sha1_name: fix error message for @{u} sha1_name: fix error message for @{}, @{} diffcore-pickaxe: make error messages more consistent diffcore-pickaxe doc: document -S and -G properly check-ignore doc: fix broken link to ls-files page fixup-builtins: retire an old transition helper script René Scharfe (2): t5004: avoid using tar for checking emptiness of archive t5004: resurrect original empty tar archive test Richard Hansen (1): Documentation/merge-options.txt: restore `-e` option SZEDER Gábor (1): test: spell 'ls-files --delete' option correctly in test descriptions Thomas Rast (2): pull: merge into unborn by fast-forwarding from empty tree apply: carefully strdup a possibly-NULL name Torsten Bögershausen (1): t7400: test of UTF-8 submodule names pass under Mac OS Vikrant Varma (2): help: add help_unknown_ref() merge: use help_unknown_ref() Version v1.8.3.2; changes since v1.8.3.1: ----------------------------------------- Felipe Contreras (1): prompt: fix for simple rebase Johan Herland (8): t2024: Add tests verifying current DWIM behavior of 'git checkout ' t2024: Show failure to use refspec when DWIMming remote branch names checkout: Use remote refspecs when DWIMming tracking branches t3200.39: tracking setup should fail if there is no matching refspec. t7201.24: Add refspec to keep --track working t9114.2: Don't use --track option against "svn-remote"-tracking branches branch.c: Validate tracking branches with refspecs instead of refs/remotes/* glossary: Update and rephrase the definition of a remote-tracking branch John Keeping (1): contrib/subtree: don't delete remote branches if split fails Junio C Hamano (3): strbuf_branchname(): do not double-expand @{-1}~22 Start preparing for 1.8.3.2 Git 1.8.3.2 Kenichi Saita (1): difftool --dir-diff: allow changing any clean working tree file Kevin Bracey (2): t6019: demonstrate --ancestry-path A...B breakage revision.c: treat A...B merge bases as if manually specified Matthijs Kooijman (1): combine-diff.c: Fix output when changes are exactly 3 lines apart Michael Heemskerk (2): upload-pack: ignore 'shallow' lines with unknown obj-ids t5500: add test for fetching with an unknown 'shallow' Nguyễn Thái Ngọc Duy (3): clone: let the user know when check_everything_connected is run urls.txt: avoid auto converting to hyperlink fetch-pack: prepare updated shallow file before fetching the pack Ramkumar Ramachandra (4): push: factor out the detached HEAD error message push: fail early with detached HEAD and current push: make push.default = current use resolved HEAD completion: complete diff --word-diff René Scharfe (1): commit: don't start editor if empty message is given with -m Stefano Lattarini (1): configure: fix option help message for --disable-pthreads Thomas Gummerer (1): prompt: fix show upstream with svn and zsh Thomas Rast (1): Document push --no-verify Torsten Bögershausen (1): t0070 "mktemp to unwritable directory" needs SANITY Wieland Hoffmann (1): pre-push.sample: Make the script executable Version v1.8.3.1; changes since v1.8.3: --------------------------------------- Erik Faye-Lund (1): mingw: make mingw_signal return the correct handler Felipe Contreras (1): sha1_file: trivial style cleanup Fredrik Gustafsson (1): Document .git/modules Jonathan Nieder (1): config: allow inaccessible configuration under $HOME Junio C Hamano (3): Start 1.8.3.1 maintenance track t/README: test_must_fail is for testing Git Git 1.8.3.1 Karsten Blees (1): dir.c: fix ignore processing within not-ignored directories Phil Hord (1): trivial: Add missing period in documentation René Scharfe (1): submodule: remove redundant check for the_index.initialized Version v1.8.3; changes since v1.8.3-rc3: ----------------------------------------- Amit Bakshi (1): remote-hg: set stdout to binary mode on win32 Felipe Contreras (3): completion: regression fix for zsh remote-hg: trivial configuration note cleanup remote-hg: fix order of configuration comments Jonathan Nieder (1): git-svn: clarify explanation of --destination argument Junio C Hamano (1): Git 1.8.3 Nathan Gray (1): git-svn: multiple fetch/branches/tags keys are supported Tobias Schulte (1): git-svn: introduce --parents parameter for commands branch and tag Version v1.8.3-rc3; changes since v1.8.3-rc2: --------------------------------------------- Dale R. Worley (1): git-submodule.txt: Clarify 'init' and 'add' subcommands. Dale Worley (1): CodingGuidelines: Documentation/*.txt are the sources Felipe Contreras (13): remote-bzr: update old organization remote-hg: trivial cleanups remote-hg: get rid of unused exception checks remote-hg: enable track-branches in hg-git mode remote-hg: add new get_config_bool() helper remote-hg: fix new branch creation remote-hg: disable forced push by default remote-hg: don't push fake 'master' bookmark remote-hg: update bookmarks when pulling remote-bzr: fix cloning of non-listable repos Revert "remote-hg: update bookmarks when pulling" remote-bzr: fixes for older versions of bzr documentation: trivial style cleanups John Keeping (1): difftool: fix dir-diff when file does not exist in working tree Junio C Hamano (1): Git 1.8.3-rc3 Peter Krefting (1): gitk: Update Swedish translation (304t) Sandor Bodo-Merle (1): remote-bzr: fix old organization destroy Version v1.8.3-rc2; changes since v1.8.3-rc1: --------------------------------------------- Anand Kumria (1): gitk: Display the date of a tag in a human-friendly way David Aguilar (1): mergetools/kdiff3: do not use --auto when diffing Felipe Contreras (25): remote-bzr: cleanup CustomTree remote-bzr: delay blob fetching until the very end remote-bzr: fix order of locking in CustomTree remote-bzr: always try to update the worktree remote-bzr: add support to push merges remote-bzr: fixes for branch diverge remote-bzr: fix partially pushed merge remote-bzr: use branch variable when appropriate remote-bzr: add support for bzr repos remote-bzr: fix branch names remote-bzr: add support for shared repo remote-bzr: improve author sanitazion remote-bzr: add custom method to find branches remote-bzr: add option to specify branches remote-bzr: improve progress reporting remote-bzr: iterate revisions properly remote-bzr: delay peer branch usage remote-bzr: access branches only when needed transport-helper: improve push messages remote-bzr: convert all unicode keys to str remote-bzr: avoid bad refs remote-bzr: fix for disappeared revisions remote-helpers: trivial cleanup transport-helper: trivial style cleanup gitk: Simplify file filtering Gauthier Östervall (1): gitk: Move hard-coded colors to .gitk Jiang Xin (2): l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed) l10n: zh_CN.po: translate 44 messages (2080t0f0u) John Keeping (1): merge-tree: handle directory/empty conflict correctly Jonathan Nieder (1): Git::SVN::*: add missing "NAME" section to perldoc Junio C Hamano (4): Update draft release notes for 1.8.3 cherry-pick: picking a tag that resolves to a commit is OK Git 1.8.2.3 Git 1.8.3-rc2 Knut Franke (1): gitk: Add menu item for reverting commits Martin Langhoff (1): gitk: Add support for -G'regex' pickaxe variant Michael Contreras (1): git-svn: avoid self-referencing mergeinfo Paul Mackerras (1): gitk: Improve behaviour of drop-down lists Paul Walmsley (1): git-svn: added an --include-path flag Peter Krefting (1): l10n: Update Swedish translation (2080t0f0u) Ralf Thielow (1): l10n: de.po: translate 44 new messages René Scharfe (2): t5004: ignore pax global header file t5004: avoid using tar for checking emptiness of archive Tair Sabirgaliev (1): gitk: On OSX, bring the gitk window to front Torsten Bögershausen (1): test-bzr: do not use unportable sed '\+' Tran Ngoc Quan (1): l10n: Update Vietnamese translation (2080t0f0u) Version v1.8.3-rc1; changes since v1.8.3-rc0: --------------------------------------------- Anders Granskogen Bjørnstad (1): Documentation/git-commit: Typo under --edit Felipe Contreras (5): completion: add missing format-patch options documentation: trivial whitespace cleanups complete: zsh: trivial simplification complete: zsh: use zsh completion for the main cmd completion: zsh: don't override suffix on _detault H. Merijn Brand (1): Git.pm: call tempfile from File::Temp as a regular function John Keeping (2): merge-tree: fix typo in "both changed identically" t/Makefile: remove smoke test targets Junio C Hamano (2): Update draft release notes to 1.8.3 Git 1.8.3-rc1 Marc Branchaud (1): Fix grammar in the 1.8.3 release notes. Ramkumar Ramachandra (5): git-completion.bash: lexical sorting for diff.statGraphWidth git-completion.bash: add diff.submodule to config list git-completion.bash: complete branch.*.rebase as boolean git-completion.bash: add branch.*.pushremote to config list git-completion.bash: add remote.pushdefault to config list Ramsay Allan Jones (2): clone: Make the 'junk_mode' symbol a file static pretty: Fix bug in truncation support for %>, %< and %>< René Scharfe (3): pretty: simplify input line length calculation in pp_user_info() pretty: simplify output line length calculation in pp_user_info() pretty: remove intermediate strbufs from pp_user_info() Thomas Rast (4): remote: add a test for extra arguments, according to docs remote: check for superfluous arguments in 'git remote add' remote: 'show' and 'prune' can take more than one remote unpack_entry: avoid freeing objects in base cache Zoltan Klinger (1): bash-prompt.sh: show where rebase is at when stopped Version v1.8.3-rc0; changes since v1.8.2.3: ------------------------------------------- Aaron Schrab (2): clone: Fix error message for reference repository clone: Allow repo using gitfile as a reference Antoine Pelisse (5): combine-diff: coalesce lost lines optimally fast-export: Allow pruned-references in mark file strbuf: create strbuf_humanise_bytes() to show byte sizes count-objects: add -H option to humanize sizes remote-hg: activate graphlog extension for hg_log() Brad King (1): commit-tree: document -S option consistently Brandon Casey (11): commit, cherry-pick -s: remove broken support for multiline rfc2822 fields t/test-lib-functions.sh: allow to specify the tag name to test_commit t/t3511: add some tests of 'cherry-pick -s' functionality sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer sequencer.c: require a conforming footer to be preceded by a blank line sequencer.c: always separate "(cherry picked from" from commit body sequencer.c: teach append_signoff how to detect duplicate s-o-b sequencer.c: teach append_signoff to avoid adding a duplicate newline Unify appending signoff in format-patch, commit and sequencer t7502: perform commits using alternate editor in a subshell git-commit: populate the edit buffer with 2 blank lines before s-o-b Brian Gernhardt (3): t5550: do not assume the "matching" push is the default t5551: do not assume the "matching" push is the default t5570: do not assume the "matching" push is the default Christophe Simonis (3): remote-bzr: fix directory renaming remote-bzr: remove files before modifications remote-bzr: fix utf-8 support for fetching David Aguilar (4): difftool: silence uninitialized variable warning t7800: update copyright notice t7800: modernize tests t7800: "defaults" is no longer a builtin tool name David Engster (1): remote-bzr: set author if available Dusty Phillips (3): remote-hg: add missing config variable in doc remote-hg: push to the appropriate branch remote-helpers: avoid has_key Felipe Contreras (64): remote-bzr: avoid echo -n remote-helpers: fix the run of all tests remote-bzr: remove stale check code for tests remote-hg: fix hg-git test-case remote-bzr: only update workingtree on local repos remote-bzr: avoid unreferred tags remote-bzr: add utf-8 support for pushing send-email: make annotate configurable format-patch: improve head calculation for cover-letter format-patch: refactor branch name calculation log: update to OPT_BOOL format-patch: add format.coverLetter configuration variable format-patch: trivial cleanups remote-bzr: improve tag handling remote-hg: trivial cleanups remote-hg: properly report errors on bookmark pushes remote-hg: make sure fake bookmarks are updated remote-hg: trivial test cleanups remote-hg: redirect buggy mercurial output remote-hg: split bookmark handling remote-hg: refactor export remote-hg: update remote bookmarks remote-hg: update tags globally remote-hg: force remote push remote-hg: show more proper errors remote-hg: add basic author tests remote-hg: add simple mail test remote-hg: fix bad state issue remote-hg: fix bad file paths completion: add more cherry-pick options completion: trivial test improvement completion: get rid of empty COMPREPLY assignments rebase-am: explicitly disable cover-letter completion: add new __gitcompadd helper completion: add __gitcomp_nl tests completion: get rid of compgen completion: inline __gitcomp_1 to its sole callsite completion: small optimization branch: colour upstream branches remote-bzr: fix prefix of tags remote-hg: safer bookmark pushing remote-hg: use python urlparse remote-hg: properly mark branches up-to-date remote-hg: add branch_tip() helper remote-hg: add support for tag objects remote-hg: custom method to write tags remote-hg: write tags in the appropriate branch remote-hg: add custom local tag write code remote-hg: improve email sanitation remote-hg: add support for schemes extension remote-hg: don't update bookmarks unnecessarily remote-hg: allow refs with spaces remote-hg: small performance improvement remote-hg: use marks instead of inlined files remote-hg: strip extra newline remote-bzr: use proper push method remote-helpers: trivial cleanups remote-hg: remove extra check remote-bzr: fix bad state issue remote-bzr: add support to push URLs remote-hg: use hashlib instead of hg sha1 util remote-bzr: store converted URL remote-bzr: tell bazaar to be quiet remote-bzr: strip extra newline Jacob Sarvis (1): log: read gpg settings for signed commit verification Jeff King (53): upload-pack: use get_sha1_hex to parse "shallow" lines upload-pack: do not add duplicate objects to shallow list upload-pack: remove packet debugging harness fetch-pack: fix out-of-bounds buffer offset in get_ack send-pack: prefer prefixcmp over memcmp in receive_status upload-archive: do not copy repo name upload-archive: use argv_array to store client arguments write_or_die: raise SIGPIPE when we get EPIPE pkt-line: move a misplaced comment pkt-line: drop safe_write function pkt-line: provide a generic reading function with options pkt-line: teach packet_read_line to chomp newlines pkt-line: move LARGE_PACKET_MAX definition from sideband pkt-line: provide a LARGE_PACKET_MAX static buffer pkt-line: share buffer/descriptor reading implementation teach get_remote_heads to read from a memory buffer remote-curl: pass buffer straight to get_remote_heads remote-curl: move ref-parsing code up in file remote-curl: always parse incoming refs t2200: check that "add -u" limits itself to subdirectory fast-export: rename handle_object function fast-export: do not load blob objects twice do not use GIT_TRACE_PACKET=3 in tests stream_blob_to_fd: detect errors reading from stream check_sha1_signature: check return value from read_istream read_istream_filtered: propagate read error from upstream avoid infinite loop in read_istream_loose add test for streaming corrupt blobs streaming_write_entry: propagate streaming errors add tests for cloning corrupted repositories clone: die on errors from unpack_trees clone: run check_everything_connected t1300: document some aesthetic failures of the config editor clone: leave repo in place after checkout errors t5516 (fetch-push): drop implicit arguments from helper functions t3200: test --set-upstream-to with bogus refs branch: factor out "upstream is not a branch" error messages branch: improve error message for missing --set-upstream-to ref branch: mention start_name in set-upstream error messages branch: give advice when tracking start-point is missing rm: do not complain about d/f conflicts during deletion t3600: test behavior of reverse-d/f conflict t3600: document failure of rm across symbolic links http: add HTTP_KEEP_ERROR option remote-curl: show server content on http errors remote-curl: let servers override http 404 advice remote-curl: always show friendlier 404 message remote-curl: consistently report repo url for http errors http: simplify http_error helper function http: re-word http error message remote-curl: die directly with http error messages http: drop http_error function http: set curl FAILONERROR each time we select a handle Jens Lehmann (2): submodule: add 'deinit' command submodule deinit: clarify work tree removal message Jiang Xin (3): l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed) l10n: zh_CN.po: translate 54 messages (2048t0f0u) i18n: branch: mark strings for translation John Keeping (16): Makefile: make mandir, htmldir and infodir absolute git-difftool(1): fix formatting of --symlink description difftool: avoid double slashes in symlink targets difftool --dir-diff: symlink all files matching the working tree refs.c: fix fread error handling t7800: move '--symlinks' specific test to the end difftool: don't overwrite modified files t7800: don't hide grep output t7800: fix tests when difftool uses --no-symlinks t7800: run --dir-diff tests with and without symlinks submodule: print graph output next to submodule log gitremote-helpers(1): clarify refspec behaviour merge-tree: don't print entries that match "local" fast-export: add --signed-tags=warn-strip mode transport-helper: pass --signed-tags=warn-strip to fast-export transport-helper: add 'signed-tags' capability John Koleszar (1): http-backend: respect GIT_NAMESPACE with dumb clients John Szakmeister (1): git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X Jonathan Nieder (11): sequencer.c: rework search for start of footer to improve clarity shell doc: emphasize purpose and security model shell: new no-interactive-login command to print a custom message push test: use test_config when appropriate push test: simplify check of push result push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi' add: make pathless 'add [-u|-A]' warning a file-global function add: make warn_pathless_add() a no-op after first call add -u: only show pathless 'add -u' warning when changes exist outside cwd add -A: only show pathless 'add -A' warning when changes exist outside cwd convert: The native line-ending is \r\n on MinGW Jonathon Mah (1): branch: give better message when no names specified for rename Junio C Hamano (53): t5404: do not assume the "matching" push is the default t5505: do not assume the "matching" push is the default t5516: do not assume the "matching" push is the default t5517: do not assume the "matching" push is the default t5519: do not assume the "matching" push is the default t5531: do not assume the "matching" push is the default t7406: do not assume the "matching" push is the default t9400: do not assume the "matching" push is the default t9401: do not assume the "matching" push is the default simplify-merges: drop merge from irrelevant side branch config.mak.in: remove unused definitions parse_fetch_refspec(): clarify the codeflow a bit fetch: use struct ref to represent refs to be fetched upload-pack: optionally allow fetching from the tips of hidden refs fetch: fetch objects by their exact SHA-1 object names Makefile: do not export mandir/htmldir/infodir match_push_refs(): nobody sets src->peer_ref anymore commit.c: add clear_commit_marks_many() commit.c: add in_merge_bases_many() commit.c: use clear_commit_marks_many() in in_merge_bases_many() push: --follow-tags for_each_reflog_ent(): extract a helper to process a single entry for_each_recent_reflog_ent(): simplify opening of a reflog file reflog: add for_each_reflog_ent_reverse() API builtin/add.c: simplify boolean variables git add: start preparing for "git add ..." to default to "-A" Start the post 1.8.2 cycle The first wave of topics for 1.8.3 Update draft release notes to 1.8.3 merge-one-file: remove stale comment merge-one-file: force content conflict for "both sides added" case Second wave of topics toward 1.8.3 More topics from the second batch for 1.8.3 peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish peel_onion(): teach $foo^{object} peeler Update draft release notes to 1.8.3 Update draft release notes to 1.8.3 Update draft release notes to 1.8.3 Update draft release notes to 1.8.3 Update draft release notes to 1.8.3 Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013-01-17) Update dtaft release notes to 1.8.3 Update draft release notes to 1.8.3 git add: rework the logic to warn "git add ..." default change Update draft release notes to 1.8.3 Update draft release notes to 1.8.3 git add: rephrase the "removal will cease to be ignored" warning Update draft release notes to 1.8.3 git add: --ignore-removal is a better named --no-all git add: rephrase -A/--no-all warning Update draft release notes to 1.8.3 git add: avoid "-u/-A without pathspec" warning on stat-dirty paths Git 1.8.3-rc0 Karsten Blees (14): dir.c: git-status --ignored: don't drop ignored directories dir.c: git-status --ignored: don't list files in ignored directories dir.c: git-status --ignored: don't list empty ignored directories dir.c: git-ls-files --directories: don't hide empty directories dir.c: git-status --ignored: don't list empty directories as ignored dir.c: make 'git-status --ignored' work within leading directories dir.c: git-clean -d -X: don't delete tracked directories dir.c: factor out parts of last_exclude_matching for later reuse dir.c: move prep_exclude dir.c: unify is_excluded and is_path_excluded APIs dir.c: replace is_path_excluded with now equivalent is_excluded API dir.c: git-status: avoid is_excluded checks for tracked files dir.c: git-status --ignored: don't scan the work tree three times dir.c: git-status --ignored: don't scan the work tree twice Kevin Bracey (5): mergetools/p4merge: swap LOCAL and REMOTE mergetools/p4merge: create a base if none available git-merge-one-file: style cleanup git-merge-one-file: send "ERROR:" messages to stderr checkout: abbreviate hash in suggest_reattach Kirill Smelkov (1): Fix `make install` when configured with autoconf Lukas Fleischer (3): attr.c: extract read_index_data() as read_blob_data_from_index() read_blob_data_from_index(): optionally return the size of blob data convert.c: remove duplicate code Matthieu Moy (3): status: show 'revert' state and status hint status: show commit sha1 in "You are currently reverting" message add: add a blank line at the end of pathless 'add [-u|-A]' warning Michael Haggerty (1): rev-parse: clarify documentation for the --verify option Michal Nazarewicz (6): Git.pm: allow command_close_bidi_pipe to be called as method Git.pm: fix example in command_close_bidi_pipe documentation Git.pm: refactor command_close_bidi_pipe to use _cmd_close Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe Git.pm: add interface for git credential command git-send-email: use git credential to obtain password Mike Gorchak (2): date.c: fix unsigned time_t comparison Fix time offset calculation in case of unsigned time_t Miklos Vajna (1): cherry-pick: make sure all input objects are commits Miklós Fazekas (1): git p4: avoid expanding client paths in chdir Modestas Vainius (1): Support FTP-over-SSL/TLS for regular FTP Nguyễn Thái Ngọc Duy (28): git-count-objects.txt: describe each line in -v output t4014: more tests about appending s-o-b lines format-patch: update append_signoff prototype sha1_file: reorder code in prepare_packed_git_one() count-objects: report garbage files in pack directory too count-objects: report how much disk space taken by garbage files wt-status: move strbuf into read_and_strip_branch() wt-status: split wt_status_state parsing function out wt-status: move wt_status_get_state() out to wt_status_print() status: show more info than "currently not on any branch" branch: show more information when HEAD is detached Preallocate hash tables when the number of inserts are known in advance status, branch: fix the misleading "bisecting" message checkout: avoid unnecessary match_pathspec calls checkout: add --ignore-skip-worktree-bits in sparse checkout mode pretty: save commit encoding from logmsg_reencode if the caller needs it pretty: get the correct encoding for --pretty:format=%e pretty-formats.txt: wrap long lines pretty: share code between format_decoration and show_decorations utf8.c: move display_mode_esc_sequence_len() for use by other functions utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences utf8.c: add reencode_string_len() that can handle NULs in string pretty: two phase conversion for non utf-8 commits pretty: split color parsing into a separate function pretty: add %C(auto) for auto-coloring pretty: support padding placeholders, %< %> and %>< pretty: support truncating in %>, %< and %>< pretty: support %>> that steal trailing spaces Pete Wyckoff (2): git p4 test: make sure P4CONFIG relative path works git p4 test: should honor symlink in p4 client root Peter Krefting (1): l10n: Update Swedish translation (2048t0f0u) Peter van Zetten (1): remote-hg: fix for files with spaces Phil Hord (1): rebase: find orig_head unambiguously Philip Oakley (5): builtin/help.c: split "-a" processing into two builtin/help.c: add --guide option builtin/help.c: add list_common_guides_help() function help: mention -a and -g option, and 'git help ' usage. doc: include --guide option description for "git help" Ralf Thielow (1): l10n: de.po: translate 54 new messages Ramkumar Ramachandra (14): t5520: use test_config to set/unset git config variables (leftover bits) remote.c: simplify a bit of code using git_config_string() t5516 (fetch-push): update test description remote.c: introduce a way to have different remotes for fetch/push remote.c: introduce remote.pushdefault remote.c: introduce branch..pushremote git-shortlog.txt: remove (-h|--help) from OPTIONS revisions.txt: clarify the .. and ... syntax git-log.txt: order OPTIONS properly; move .. git-log.txt: generalize .. git-log.txt: rewrite note on why "--" may be required git-shortlog.txt: make SYNOPSIS match log, update OPTIONS builtin/log.c: make usage string consistent with doc builtin/shortlog.c: make usage string consistent with log Ramsay Allan Jones (5): msvc: Fix compilation errors caused by poll.h emulation msvc: git-daemon: Fix linker "unresolved external" errors msvc: Fix build by adding missing symbol defines msvc: test-svn-fe: Fix linker "unresolved external" error msvc: avoid collisions between "tags" and "TAGS" René Scharfe (1): archive-zip: use deflateInit2() to ask for raw compressed data Sebastian Götte (5): Move commit GPG signature verification to commit.c commit.c/GPG signature verification: Also look at the first GPG status line merge/pull: verify GPG signatures of commits being merged merge/pull Check for untrusted good GPG signatures pretty printing: extend %G? to include 'N' and 'U' Sebastian Schuberth (1): git-svn: Support custom tunnel schemes instead of SSH only Simon Ruderich (4): git-am: show the final log message on "Applying:" indicator remote-hg: add 'insecure' option remote-hg: document location of stored hg repository help: mark common_guides[] as translatable Stefano Lattarini (1): zlib: fix compilation failures with Sun C Compilaer Steven Walter (1): safe_create_leading_directories: fix race that could give a false negative Ted Zlatanov (1): Add contrib/credentials/netrc with GPG support Thomas Rast (8): sha1_file: remove recursion in packed_object_info Refactor parts of in_delta_base_cache/cache_or_unpack_entry sha1_file: remove recursion in unpack_entry Avoid loading commits twice in log with diffs t/README: --valgrind already implies -v tests: parameterize --valgrind option tests --valgrind: provide a mode without --track-origins tests: notice valgrind error in test_must_fail Timotheus Pokorra (1): remote-bzr: add utf-8 support for fetching Torstein Hegge (3): t9903: Don't fail when run from path accessed through symlink bisect: Store first bad commit as comment in log file bisect: Log possibly bad, skipped commits at bisection end Torsten Bögershausen (4): Make core.sharedRepository work under cygwin 1.7 path.c: simplify adjust_shared_perm() path.c: optimize adjust_shared_perm() test-bzr: portable shell and utf-8 strings for Mac OS Tran Ngoc Quan (1): l10n: vi.po: Update translation (2048t0u0f) Yann Droneaud (12): t3400: use test_config to set/unset git config variables t4304: use test_config to set/unset git config variables t4034: use test_config/test_unconfig to set/unset git config variables t4202: use test_config/test_unconfig to set/unset git config variables t5520: use test_config to set/unset git config variables t5541: use test_config to set/unset git config variables t7500: use test_config to set/unset git config variables t7508: use test_config to set/unset git config variables t9500: use test_config to set/unset git config variables t7502: use test_config to set/unset git config variables t7502: remove clear_config t7600: use test_config to set/unset git config variables Version v1.8.2.3; changes since v1.8.2.2: ----------------------------------------- Anders Granskogen Bjørnstad (1): Documentation/git-commit: Typo under --edit David Aguilar (1): mergetools/kdiff3: do not use --auto when diffing Felipe Contreras (5): documentation: trivial whitespace cleanups complete: zsh: trivial simplification complete: zsh: use zsh completion for the main cmd completion: zsh: don't override suffix on _detault transport-helper: trivial style cleanup John Keeping (1): t/Makefile: remove smoke test targets Jonathan Nieder (1): glossary: a revision is just a commit Junio C Hamano (1): Git 1.8.2.3 Ramkumar Ramachandra (3): git-completion.bash: lexical sorting for diff.statGraphWidth git-completion.bash: add diff.submodule to config list git-completion.bash: complete branch.*.rebase as boolean René Scharfe (2): t5004: ignore pax global header file t5004: avoid using tar for checking emptiness of archive Thomas Rast (4): read_revisions_from_stdin: make copies for handle_revision_arg remote: add a test for extra arguments, according to docs remote: check for superfluous arguments in 'git remote add' remote: 'show' and 'prune' can take more than one remote Version v1.8.2.2; changes since v1.8.2.1: ----------------------------------------- Adam Spiers (1): t: make PIPE a standard test prerequisite Antoine Pelisse (2): fix clang -Wtautological-compare with unsigned enum Allow combined diff to ignore white-spaces Benoit Bourbie (1): Typo fix: replacing it's -> its Carlos Martín Nieto (1): Documentation/git-commit: reword the --amend explanation David Aguilar (1): help.c: add a compatibility comment to cmd_version() Felipe Contreras (2): remote-hg: fix commit messages prompt: fix untracked files for zsh Jakub Narębski (1): gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM Jeff King (13): submodule: clarify logic in show_submodule_summary filter-branch: return to original dir after filtering diffcore-pickaxe: remove fill_one() diffcore-pickaxe: unify code for log -S/-G show-branch: use strbuf instead of static buffer doc/http-backend: clarify "half-auth" repo configuration doc/http-backend: give some lighttpd config examples doc/http-backend: match query-string in apache half-auth example t/test-lib.sh: drop "$test" variable usage: allow pluggable die-recursion checks run-command: use thread-aware die_is_recursing routine cat-file: print tags raw for "cat-file -p" receive-pack: close sideband fd on early pack errors Jiang Xin (1): i18n: make the translation of -u advice in one go Johannes Sixt (3): rerere forget: grok files containing NUL rerere forget: do not segfault if not all stages are present t6200: avoid path mangling issue on Windows John Keeping (5): diffcore-break: don't divide by zero bisect: avoid signed integer overflow git-merge(1): document diff-algorithm option to merge-recursive diff: allow unstuck arguments with --diff-algorithm t/test-lib.sh: fix TRASH_DIRECTORY handling Jonathan Nieder (1): gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility Junio C Hamano (13): merge: a random object may not necssarily be a commit apply --whitespace=fix: avoid running over the postimage buffer t5516: test interaction between pushURL and pushInsteadOf correctly test: resurrect q_to_tab t6200: use test_config/test_unconfig t6200: test message for merging of an annotated tag diffcore-pickaxe: port optimization from has_changes() to diff_grep() diffcore-pickaxe: fix leaks in "log -S" and "log -G" glossary: extend "detached HEAD" description doc: clarify that "git daemon --user=" option does not export HOME=~user Start preparing for 1.8.2.2 Update draft release notes to 1.8.2.2 Git 1.8.2.2 Kevin Bracey (1): cherry-pick/revert: make usage say '...' Lukas Fleischer (1): bundle: Accept prerequisites without commit messages Martin von Gagern (1): Documentation: Strip texinfo anchors to avoid duplicates Mårten Kongstad (1): completion: remove duplicate block for "git commit -c" Paul Price (1): fast-export: fix argument name in error messages Peter Eisentraut (1): pull: Apply -q and -v options to rebase mode as well Ralf Thielow (2): fmt-merge-msg: respect core.commentchar in people credits fmt-merge-msg: use core.commentchar in tag signatures completely Ramkumar Ramachandra (4): t3200 (branch): modernize style send-email: use "return;" not "return undef;" on error codepaths send-email: drop misleading function prototype send-email: use the three-arg form of open in recipients_cmd René Scharfe (5): match-trees: simplify score_trees() using tree_entry() t5004: fix issue with empty archive test and bsdtar archive: clarify explanation of --worktree-attributes pretty: handle broken commit headers gracefully blame: handle broken commit headers gracefully Robin Rosenberg (1): bash: teach __git_ps1 about REVERT_HEAD Simon Ruderich (3): diffcore-pickaxe: remove unnecessary call to get_textconv() diffcore-pickaxe: respect --no-textconv t/README: --immediate skips cleanup commands for failed tests Stefan Saasen (1): Documentation: distinguish between ref and offset deltas in pack-format Stefano Lattarini (9): doc: various spelling fixes git-remote-mediawiki: spelling fixes contrib/subtree: fix spelling of accidentally obstack: fix spelling of similar compat/regex: fix spelling and grammar in comments compat/nedmalloc: fix spelling in comments precompose-utf8: fix spelling of "want" in error message kwset: fix spelling in comments Correct common spelling mistakes in comments and tests Thomas Ackermann (4): glossary: remove outdated/misleading/irrelevant entries glossary: improve description of SHA-1 related topics The name of the hash function is "SHA-1", not "SHA1" glossary: improve definitions of refspec and pathspec Thomas Rast (2): perl: redirect stderr to /dev/null instead of closing t9700: do not close STDERR Torsten Bögershausen (5): t9020: do not use export X=Y t9501: do not use export X=Y test-hg-bidi.sh: do not use export X=Y test-hg-hg-git.sh: do not use export X=Y t7409: do not use export X=Y Version v1.8.2.1; changes since v1.8.2: --------------------------------------- Andrew Wong (2): setup.c: stop prefix_pathspec() from looping past the end of string setup.c: check that the pathspec magic ends with ")" Antoine Pelisse (3): update-index: allow "-h" to also display options diff: Fix rename pretty-print when suffix and prefix overlap tests: make sure rename pretty print works Brandon Casey (4): t/t7502: compare entire commit message with what was expected t7502: demonstrate breakage with a commit message with trailing newlines git-commit: only append a newline to -m mesg if necessary Documentation/git-commit.txt: rework the --cleanup section Christian Helmuth (1): git-commit doc: describe use of multiple `-m` options Dan Bornstein (1): Correct the docs about GIT_SSH. David Aguilar (20): git-sh-setup: use a lowercase "usage:" string git-svn: use a lowercase "usage:" string git-relink: use a lowercase "usage:" string git-merge-one-file: use a lowercase "usage:" string git-archimport: use a lowercase "usage:" string git-cvsexportcommit: use a lowercase "usage:" string git-cvsimport: use a lowercase "usage:" string git-cvsimport: use a lowercase "usage:" string contrib/credential: use a lowercase "usage:" string contrib/fast-import: use a lowercase "usage:" string contrib/fast-import/import-zips.py: fix broken error message contrib/fast-import/import-zips.py: use spaces instead of tabs contrib/examples: use a lowercase "usage:" string contrib/hooks/setgitperms.perl: use a lowercase "usage:" string templates/hooks--update.sample: use a lowercase "usage:" string Documentation/user-manual.txt: use a lowercase "usage:" string git-svn: use a lowercase "usage:" string tests: use a lowercase "usage:" string contrib/examples/git-remote.perl: use a lowercase "usage:" string contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string David Michael (1): git-compat-util.h: Provide missing netdb.h definitions Greg Price (2): Fix ".git/refs" stragglers describe: Document --match pattern format Jeff King (23): utf8: accept alternate spellings of UTF-8 mailsplit: sort maildir filenames more cleverly cache.h: drop LOCAL_REPO_ENV_SIZE environment: add GIT_PREFIX to local_repo_env setup: suppress implicit "." work-tree for bare repos test-lib: factor out $GIT_UNZIP setup archive: handle commits with an empty tree upload-pack: drop lookup-before-parse optimization upload-pack: make sure "want" objects are parsed upload-pack: load non-tip "want" objects from disk avoid segfaults on parse_object failure use parse_object_or_die instead of die("bad object") pack-refs: write peeled entry for non-tags index-pack: always zero-initialize object_entry list fast-import: use pointer-to-pointer to keep list tail drop some obsolete "x = x" compiler warning hacks transport: drop "int cmp = cmp" hack run-command: always set failed_errno in start_command fast-import: clarify "inline" logic in file_change_m wt-status: fix possible use of uninitialized variable dir.c::match_pathname(): adjust patternlen when shifting pattern dir.c::match_pathname(): pay attention to the length of string parameters t: check that a pattern without trailing slash matches a directory Johannes Sixt (1): t2003: work around path mangling issue on Windows John Keeping (4): Revert "graph.c: mark private file-scope symbols as static" t2003: modernize style entry: fix filter lookup merge-tree: fix typo in merge-tree.c::unresolved Joshua Clayton (1): Git.pm: fix cat_blob crashes on large files Junio C Hamano (21): imap-send: support Server Name Indication (RFC4366) diff-options: unconfuse description of --color describe: --match= must limit the refs even when used with --all reflog: fix typo in "reflog expire" clean-up codepath Documentation/git-push: clarify the description of defaults git status: document trade-offs in choosing parameters to the -u option CodingGuidelines: our documents are in AsciiDoc Documentation: merging a tag is a special case transport.c: help gcc 4.6.3 users by squelching compiler warning Start preparing for 1.8.2.1 attr.c::path_matches(): the basename is part of the pathname More corrections for 1.8.2.1 More fixes for 1.8.2.1 attr.c::path_matches(): special case paths that end with a slash dir.c::match_basename(): pay attention to the length of string parameters Update draft release notes to 1.8.2.1 Start preparing for 1.8.1.6 Update draft release notes to 1.8.2.1 mailmap: update Pasky's address Git 1.8.1.6 Git 1.8.2.1 Kacper Kornet (3): rev-parse: clarify documentation of $name@{upstream} syntax t1507: Test that branchname@{upstream} is interpreted as branch Fix revision walk for commits with the same dates Karsten Blees (1): name-hash.c: fix endless loop with core.ignorecase=true Kirill Smelkov (1): format-patch: RFC 2047 says multi-octet character may not be split Lukas Fleischer (2): bundle: Fix "verify" output if history is complete bundle: Add colons to list headings in "verify" Matthias Krüger (1): git help config: s/insn/instruction/ Matthieu Moy (1): git-remote-mediawiki: new wiki URL in documentation Max Nanasy (1): diff.c: diff.renamelimit => diff.renameLimit in message Michael Haggerty (1): pack-refs: add fully-peeled trait Michael J Gruber (5): gpg-interface: check good signature in a reliable way log-tree: rely upon the check in the gpg_interface gpg_interface: allow to request status return pretty: parse the gpg status lines rather than the output pretty: make %GK output the signing key for signed commits Mihai Capotă (1): git-pull doc: fix grammo ("conflicts" is plural) Nguyễn Thái Ngọc Duy (7): index-format.txt: mention of v4 is missing in some places read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() branch: segfault fixes and validation update-index: list supported idx versions and their features status: advise to consider use of -u when read_directory takes too long index-pack: fix buffer overflow caused by translations index-pack: protect deepest_delta in multithread code Phil Hord (1): tag: --force does not have to warn when creating tags Ramkumar Ramachandra (1): t4018,7810,7811: remove test_config() redefinition Ramsay Allan Jones (2): fast-import: Fix an gcc -Wuninitialized warning cat-file: Fix an gcc -Wuninitialized warning René Scharfe (4): archive-zip: fix compressed size for stored export-subst files Makefile: keep LIB_H entries together and sorted sha1_name: pass object name length to diagnose_invalid_sha1_path() submodule summary: support --summary-limit= Tadeusz Andrzej Kadłubowski (2): git-filter-branch.txt: clarify ident variables usage Documentation: filter-branch env-filter example Thomas Rast (3): diff: prevent pprint_rename from underrunning input index-pack: guard nr_resolved_deltas reads by lock git-tag(1): we tag HEAD by default Torsten Bögershausen (1): remote-helpers/test-bzr.sh: do not use "grep '\s'" W. Trevor King (2): Documentation/githooks: Explain pre-rebase parameters user-manual: Standardize backtick quoting William Entriken (1): submodule update: when using recursion, show full path Version v1.8.2; changes since v1.8.2-rc3: ----------------------------------------- Antoine Pelisse (1): perf: update documentation of GIT_PERF_REPEAT_COUNT Eric Wong (1): git svn: consistent spacing after "W:" in warnings Greg Price (1): add: Clarify documentation of -A and -u Jan Pešta (1): git svn: ignore partial svn:mergeinfo Junio C Hamano (2): Update draft release notes to 1.8.2 Git 1.8.2 Kevin Bracey (2): Translate git_more_info_string consistently git.c: make usage match manual page Matthieu Moy (2): add: update pathless 'add [-u|-A]' warning to reflect change of plan git-completion.bash: zsh does not implement function redirection correctly Version v1.8.2-rc3; changes since v1.8.2-rc2: --------------------------------------------- Fredrik Gustafsson (1): gitweb/README: remove reference to git.kernel.org Jiang Xin (2): l10n: git.pot: v1.8.2 round 4 (1 changed) l10n: zh_CN.po: translate 1 new message Junio C Hamano (1): Git 1.8.2-rc3 Matthieu Moy (1): git-completion.zsh: define __gitcomp_file compatibility function Peter Krefting (1): l10n: Update Swedish translation (2009t0f0u) Ralf Thielow (4): l10n: de.po: translate 35 new messages l10n: de.po: translate 5 new messages l10n: de.po: correct translation of "bisect" messages l10n: de.po: translate 1 new message Tran Ngoc Quan (1): l10n: vi.po: Update translation (2009t0f0u) Version v1.8.2-rc2; changes since v1.8.2-rc1: --------------------------------------------- Andrew Wong (1): Documentation/githooks: Fix linkgit Brad King (1): Documentation/submodule: Add --force to update synopsis Erik Faye-Lund (1): Revert "compat: add strtok_r()" Junio C Hamano (3): Update draft release notes to 1.8.1.5 Git 1.8.1.5 Git 1.8.2-rc2 Karsten Blees (2): wincred: accept CRLF on stdin to simplify console usage wincred: improve compatibility with windows versions Michael Haggerty (1): Provide a mechanism to turn off symlink resolution in ceiling paths Thomas Rast (1): Make !pattern in .gitattributes non-fatal Version v1.8.2-rc1; changes since v1.8.2-rc0: --------------------------------------------- Adam Spiers (1): t0008: document test_expect_success_multi Greg Price (1): Documentation: "advice" is uncountable Jeff King (1): Makefile: avoid infinite loop on configure.ac change Jiang Xin (5): l10n: Update git.pot (35 new, 14 removed messages) l10n: zh_CN.po: translate 35 new messages l10n: git.pot: v1.8.2 round 3 (5 new) l10n: zh_CN.po: translate 5 new messages Bugfix: undefined htmldir in config.mak.autogen Junio C Hamano (8): doc: mention tracking for pull.default user-manual: typofix (ofthe->of the) RelNotes 1.8.2: push-simple will not be in effect in this release imap-send: move #ifdef around name-hash: allow hashing an empty string Git 1.8.1.4 Prepare for 1.8.1.5 Git 1.8.2-rc1 Martin Erik Werner (1): shell-prompt: clean up nested if-then Matthieu Moy (1): git.txt: update description of the configuration mechanism Oswald Buddenhagen (2): imap-send: the subject of SSL certificate must match the host imap-send: support subjectAltName as well Peter Krefting (2): l10n: Update Swedish translation (2004t0f0u) l10n: Update Swedish translation (2009t0f0u) Tran Ngoc Quan (2): l10n: vi.po: update new strings (2004t0u0f) l10n: vi.po: Updated 5 new messages (2009t0f0u) W. Trevor King (8): user-manual: use 'remote add' to setup push URLs user-manual: give 'git push -f' as an alternative to +master user-manual: mention 'git remote add' for remote branch config user-manual: use 'git config --global user.*' for setup user-manual: use -o latest.tar.gz to create a gzipped tarball user-manual: Reorganize the reroll sections, adding 'git rebase -i' user-manual: Use request-pull to generate "please pull" text user-manual: Flesh out uncommitted changes and submodule updates Version v1.8.2-rc0; changes since v1.8.1.6: ------------------------------------------- Aaron Schrab (3): hooks: Add function to check if a hook exists push: Add support for pre-push hooks Add sample pre-push hook script Adam Spiers (29): tests: test number comes first in 'not ok $count - $message' tests: paint known breakages in yellow tests: paint skipped tests in blue tests: change info messages from yellow/brown to cyan tests: refactor mechanics of testing in a sub test-lib tests: test the test framework more thoroughly tests: paint unexpectedly fixed known breakages in bold red api-directory-listing.txt: update to match code Improve documentation and comments regarding directory traversal API dir.c: rename cryptic 'which' variable to more consistent name dir.c: rename path_excluded() to is_path_excluded() dir.c: rename excluded_from_list() to is_excluded_from_list() dir.c: rename excluded() to is_excluded() dir.c: refactor is_excluded_from_list() dir.c: refactor is_excluded() dir.c: refactor is_path_excluded() dir.c: rename free_excludes() to clear_exclude_list() dir.c: use a single struct exclude_list per source of excludes dir.c: keep track of where patterns came from dir.c: provide clear_directory() for reclaiming dir_struct memory dir.c: improve docs for match_pathspec() and match_pathspec_depth() add.c: remove unused argument from validate_pathspec() add.c: move pathspec matchers into new pathspec.c for reuse pathspec.c: rename newly public functions for clarity add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse add.c: extract new die_if_path_beyond_symlink() for reuse setup.c: document get_pathspec() add git-check-ignore sub-command clean.c, ls-files.c: respect encapsulation of exclude_list_groups Adam Tkac (1): contrib/subtree: honor DESTDIR Alexey Shumkin (1): t7102 (reset): don't hardcode SHA-1 in expected outputs Andrew Wong (3): rebase: Handle cases where format-patch fails gitk: Refactor code for binding modified function keys gitk: Use bindshiftfunctionkey to bind Shift-F5 Antoine Pelisse (8): Use split_ident_line to parse author and committer mailmap: simplify map_user() interface mailmap: add mailmap structure to rev_info and pp pretty: use mailmap to display username and email log: add --use-mailmap option test: add test for --use-mailmap option log: grep author/committer using mailmap log: add log.mailmap configuration option Barry Wardell (1): git-svn: Simplify calculation of GIT_DIR Chris Hiestand (1): Add Auto-Submitted header to post-receive-email Chris Rorvick (10): push: return reject reasons as a bitset push: add advice for rejected tag reference push: keep track of "update" state separately push: flag updates that require force push: require force for refs under refs/tags/ push: require force for annotated tags push: clarify rejection of update to non-commit-ish push: cleanup push rules comment push: rename config variable for more general use push: allow already-exists advice to be disabled Christian Couder (4): Makefile: remove tracking of TCLTK_PATH Makefile: detect when PYTHON_PATH changes Makefile: replace "echo 1>..." with "echo >..." gitk: Ignore gitk-wish buildproduct Christoph J. Thompson (1): Honor configure's htmldir switch David A. Greene (3): contrib/subtree: remove test number comments contrib/subtree: better error handling for 'subtree add' contrib/subtree: fix synopsis David Aguilar (7): mergetools/vim: remove redundant diff command mergetool--lib: improve show_tool_help() output mergetools: simplify how we handle "vim" and "defaults" mergetool--lib: simplify command expressions mergetool--lib: improve the help text in guess_merge_tool() mergetool--lib: add functions for finding available tools doc: generate a list of valid merge tools David Michael (3): Support builds when sys/param.h is missing Detect when the passwd struct is missing pw_gecos Generalize the inclusion of strings.h Eric S. Raymond (1): Add checks to Python scripts for version dependencies. Eric Wong (1): git-svn: cleanup sprintf usage for uppercasing hex Felipe Contreras (26): remote-testgit: properly check for errors fast-export: avoid importing blob marks remote-testgit: fix direction of marks remote-helpers: fix failure message Add new remote-bzr transport helper remote-bzr: add support for pushing remote-bzr: add support for remote repositories Rename git-remote-testgit to git-remote-testpy Add new simplified git-remote-testgit remote-testgit: remove non-local functionality remote-testgit: remove irrelevant test remote-testgit: cleanup tests remote-testgit: exercise more features remote-testgit: report success after an import remote-testgit: implement the "done" feature manually fast-export: trivial cleanup fast-export: fix comparison in tests fast-export: don't handle uninteresting refs fast-export: make sure updated refs get updated remote-bzr: update working tree upon pushing remote-bzr: add simple tests remote-bzr: add support for fecthing special modes remote-bzr: add support to push special modes remote-bzr: add support for older versions of bzr remote-bzr: detect local repositories remote-hg: store converted URL Jeff King (28): fsck: warn about '.' and '..' in trees fsck: warn about ".git" in trees mailmap: refactor mailmap parsing for non-file sources mailmap: support reading mailmap from blobs mailmap: clean up read_mailmap error handling mailmap: fix some documentation loose-ends for mailmap.blob mailmap: default mailmap.blob in bare repositories make error()'s constant return value more visible silence some -Wuninitialized false positives add global --literal-pathspecs option Makefile: hoist uname autodetection to config.mak.uname config: add helper function for parsing key names archive-tar: use parse_config_key when parsing config convert some config callbacks to parse_config_key userdiff: drop parse_driver function submodule: use parse_config_key when parsing config submodule: simplify memory handling in config parsing help: use parse_config_key for man config reflog: use parse_config_key in config callback commit: drop useless xstrdup of commit message logmsg_reencode: never return NULL logmsg_reencode: lazily load missing commit buffers fetch: run gc --auto after fetching fetch-pack: avoid repeatedly re-scanning pack directory docs: clarify git-branch --list behavior branch: let branch filters imply --list Documentation/Makefile: clean up MAN*_TXT lists log: re-encode commit messages before grepping Jesper L. Nielsen (1): contrib/subtree: make the manual directory if needed Jiang Xin (1): l10n: Update git.pot (11 new, 7 removed messages) Johannes Sixt (1): t6130-pathspec-noglob: Windows does not allow a file named "f*" John Keeping (24): git-svn: teach find-rev to find near matches git_remote_helpers: allow building with Python 3 git_remote_helpers: fix input when running under Python 3 git_remote_helpers: force rebuild if python version changes git_remote_helpers: use 2to3 if building with Python 3 svn-fe: allow svnrdump_sim.py to run with Python 3 git-remote-testpy: hash bytes explicitly git-remote-testpy: don't do unbuffered text I/O git-remote-testpy: call print as a function git-mergetool: move show_tool_help to mergetool--lib git-mergetool: remove redundant assignment git-mergetool: don't hardcode 'mergetool' in show_tool_help git-difftool: use git-mergetool--lib for "--tool-help" mergetool--lib: don't call "exit" in setup_tool git-remote-testpy: fix path hashing on Python 3 CodingGuidelines: add Python coding guidelines mergetool--lib: list user configured tools in '--tool-help' graph: output padding for merge subsequent parents diff: write prefix to the correct file diff.c: make constant string arguments const diff: add diff_line_prefix function diff.c: use diff_line_prefix() where applicable combine-diff.c: teach combined diffs about line prefix rebase -i: respect core.commentchar Jonathan Nieder (2): Git::SVN::Editor::T: pass $deletions to ->A and ->D git svn: do not overescape URLs (fallback case) Junio C Hamano (52): diff: accept --no-follow option blame: pay attention to --no-follow t6006: clean up whitespace log --format: teach %C(auto,black) to respect color config git-compat-util.h: do not #include by default builtin/log.c: drop unused "numbered" parameter from make_cover_letter() builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter() builtin/log.c: stop using global patch_suffix get_patch_filename(): simplify function signature get_patch_filename(): drop "just-numbers" hack get_patch_filename(): split into two functions format-patch: add --reroll-count=$N option Start 1.8.2 cycle format-patch: document and test --reroll-count Update draft release notes to 1.8.2 format-patch: give --reroll-count a short synonym -v Update draft release notes to 1.8.2 string-list: allow case-insensitive string list Update draft release notes to 1.8.2 mailmap: remove email copy and length limitation log --use-mailmap: optimize for cases without --author/--committer search Update draft release notes to 1.8.2 clone: do not export and unexport GIT_CONFIG Update draft release notes to 1.8.2 Makefile: add description on PERL/PYTHON_PATH Update draft release notes to 1.8.2 Allow custom "comment char" push: fix "refs/tags/ hierarchy cannot be updated without --force" Update draft release notes to 1.8.2 upload-pack: share more code Update draft release notes to 1.8.2 Update draft release notes to 1.8.2 push: further clean up fields of "struct ref" push: further simplify the logic to assign rejection reason push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE push: finishing touches to explain REJECT_ALREADY_EXISTS better Update draft release notes to 1.8.2 Update draft release notes to 1.8.2 upload-pack: simplify request validation git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" Update draft release notes to 1.8.2 Documentation: describe the "repository" in repository-layout Update draft release notes to 1.8.2 apply: verify submodule commit object name better Update draft release notes to 1.8.2 upload/receive-pack: allow hiding ref hierarchies Update draft release notes to 1.8.2 Update draft release notes to 1.8.2 Update draft release notes to 1.8.2 Documentation/git-add: kill remaining Update draft release notes to 1.8.2 Git 1.8.2-rc0 Manlio Perillo (1): git-completion.bash: add support for path completion Marc Khouzam (1): completion: handle path completion and colon for tcsh script Marcus Karlsson (1): gitk: Fix crash when not using themed widgets Martin Erik Werner (3): shell prompt: add bash.showUntrackedFiles option t9903: add tests for bash.showUntrackedFiles t9903: add extra tests for bash.showDirtyState Martin von Zweigbergk (21): oneway_merge(): only lstat() when told to update worktree reset $pathspec: no need to discard index reset $pathspec: exit with code 0 if successful reset.c: pass pathspec around instead of (prefix, argv) pair reset: don't allow "git reset -- $pathspec" in bare repo reset.c: extract function for parsing arguments reset.c: remove unnecessary variable 'i' reset.c: extract function for updating {ORIG_,}HEAD reset.c: share call to die_if_unmerged_cache() reset --keep: only write index file once reset: avoid redundant error message reset.c: replace switch by if-else reset.c: move update_index_refresh() call out of read_from_tree() reset.c: move lock, write and commit out of update_index_refresh() reset [--mixed]: only write index file once reset.c: finish entire cmd_reset() whether or not pathspec is given reset.c: inline update_index_refresh() reset $sha1 $pathspec: require $sha1 only to be treeish reset: allow reset on unborn branch reset [--mixed]: use diff-based reset whether or not pathspec was given reset: update documentation to require only tree-ish with paths Matt Kraai (5): Make lock local to fetch_pack Port to QNX Use __VA_ARGS__ for all of error's arguments Allow building with xmlparse.h Makefile: don't run "rm" without any files Matthew Ogilvie (10): cvsserver: factor out git-log parsing logic cvsserver: cleanup extra slashes in filename arguments cvsserver: define a tag name character escape mechanism cvsserver: add misc commit lookup, file meta data, and file listing functions cvsserver: implement req_Sticky and related utilities cvsserver: generalize getmeta() to recognize commit refs cvsserver: Add version awareness to argsfromdir cvsserver: support -r and sticky tags for most operations cvsserver: add t9402 to test branch and tag refs cvsserver Documentation: new cvs ... -r support Matthieu Moy (4): add: warn when -u or -A is used without pathspec Makefile: make script-related rules usable from subdirectories git-remote-mediawiki: use toplevel's Makefile completion: support 'git config --local' Max Horn (2): remote-hg: fix handling of file perms when pushing fix clang -Wunused-value warnings for error functions Michael Haggerty (22): Add new function strbuf_add_xml_quoted() xml_entities(): use function strbuf_addstr_xml_quoted() lf_to_crlf(): NUL-terminate msg_data::data imap-send: store all_msgs as a strbuf imap-send: correctly report errors reading from stdin imap-send: change msg_data from storing (ptr, len) to storing strbuf wrap_in_html(): use strbuf_addstr_xml_quoted() wrap_in_html(): process message in bulk rather than line-by-line imap-send.c: remove msg_data::flags, which was always zero imap-send.c: remove struct msg_data iamp-send.c: remove unused struct imap_store_conf imap-send.c: remove struct store_conf imap-send.c: remove struct message imap-send.c: remove some unused fields from struct store imap-send.c: inline parse_imap_list() in parse_list() imap-send.c: remove struct imap argument to parse_imap_list_l() imap-send.c: remove namespace fields from struct imap imap-send.c: remove unused field imap_store::trashnc imap-send.c: use struct imap_store instead of struct store imap-send.c: remove unused field imap_store::uidvalidity imap-send.c: fold struct store into struct imap_store imap-send.c: simplify logic in lf_to_crlf() Michal Privoznik (3): git-completion.bash: Autocomplete --minimal and --histogram for git-diff config: Introduce diff.algorithm variable diff: Introduce --diff-algorithm command line option Nguyễn Thái Ngọc Duy (43): ctype: make sane_ctype[] const array ctype: support iscntrl, ispunct, isxdigit and isprint Import wildmatch from rsync wildmatch: remove unnecessary functions wildmatch: follow Git's coding convention Integrate wildmatch to git t3070: disable unreliable fnmatch tests wildmatch: make wildmatch's return value compatible with fnmatch wildmatch: remove static variable force_lower_case wildmatch: fix case-insensitive matching wildmatch: adjust "**" behavior wildmatch: make /**/ match zero or more directories Support "**" wildcard in .gitignore and .gitattributes pathspec: save the non-wildcard length part test-wildmatch: avoid Windows path mangling pathspec: do exact comparison on the leading non-wildcard part pathspec: apply "*.c" optimization from exclude tree_entry_interesting: do basedir compare on wildcard patterns when possible config.txt: a few lines about branch..description wildmatch: fix "**" special case wildmatch: rename constants and update prototype compat/fnmatch: respect NO_FNMATCH* even on glibc wildmatch: make dowild() take arbitrary flags wildmatch: replace variable 'special' with better named ones wildmatch: support "no FNM_PATHNAME" mode test-wildmatch: add "perf" command to compare wildmatch and fnmatch wildmatch: make a special case for "*/" with FNM_PATHNAME wildmatch: advance faster in + patterns Makefile: add USE_WILDMATCH to use wildmatch as fnmatch branch: delete branch description if it's empty t4014: a few more tests on cover letter using branch description format-patch: pick up correct branch name from symbolic ref format-patch: pick up branch description when no ref is specified upload-pack: only accept commits from "shallow" line fetch: add --unshallow for turning shallow repo into complete one upload-pack: fix off-by-one depth calculation in shallow clone fetch: elaborate --depth action Update :/abc ambiguity check grep: avoid accepting ambiguous revision branch: reject -D/-d without branch name branch: give a more helpful message on redundant arguments branch: mark more strings for translation status: show the branch name if possible in in-progress info Paul Mackerras (3): gitk: Fix display of branch names on some commits gitk: Improve display of list of nearby tags and heads gitk: Display important heads even when there are many Pete Wyckoff (35): git p4: test sync/clone --branch behavior git p4: rearrange and simplify hasOrigin handling git p4: add comments to p4BranchesInGit git p4: inline listExistingP4GitBranches git p4: create p4/HEAD on initial clone git p4: verify expected refs in clone --bare test git p4: clone --branch should checkout master git p4 doc: fix branch detection example git p4: allow short ref names to --branch git p4: rearrange self.initialParent use git p4: fail gracefully on sync with no master branch git p4: fix sync --branch when no master branch git p4 test: keep P4CLIENT changes inside subshells git p4: fix submit when no master branch git p4: temp branch name should use / even on windows git p4: remove unused imports git p4: generate better error message for bad depot path git p4 test: use client_view to build the initial client git p4 test: avoid loop in client_view git p4 test: use client_view in t9806 git p4 test: start p4d inside its db dir git p4 test: translate windows paths for cygwin git p4: remove unreachable windows \r\n conversion code git p4: scrub crlf for utf16 files on windows git p4 test: newline handling git p4 test: use LineEnd unix in windows tests too git p4 test: avoid wildcard * in windows git p4: cygwin p4 client does not mark read-only git p4 test: use test_chmod for cygwin git p4: disable read-only attribute before deleting git p4: avoid shell when mapping users git p4: avoid shell when invoking git rev-list git p4: avoid shell when invoking git config --get-all git p4: avoid shell when calling git config git p4: introduce gitConfigBool Peter Krefting (2): gitk: Update Swedish translation (296t) l10n: Update Swedish translation (1983t0f0u) Peter Wu (1): git-svn: do not escape certain characters in paths Ralf Thielow (6): l10n: de.po: address the user formally commit: make default of "cleanup" option configurable l10n: de.po: fix some minor issues l10n: de.po: translate 11 new messages l10n: de.po: translate "revision" consistently as "Revision" l10n: de.po: translate "reset" as "neu setzen" Ramsay Allan Jones (1): t3070: Disable some failing fnmatch tests René Scharfe (3): t0008: avoid brace expansion pretty: use prefixcmp instead of memcmp on NUL-terminated strings refs: use strncmp() instead of strlen() and memcmp() Robin Rosenberg (1): Enable minimal stat checking Stefan Haller (6): gitk: Synchronize highlighting in file view when scrolling diff gitk: Highlight current search hit in orange gitk: Highlight first search result immediately on incremental search gitk: Work around empty back and forward images when buttons are disabled gitk: Fix error message when clicking on a connecting line gitk: When searching, only highlight files when in Patch mode Stephen Boyd (2): gpg: allow translation of more error messages run-command: be more informative about what failed Sven Strickroth (2): mergetools: support TortoiseGitMerge mergetools: teach tortoisemerge to handle filenames with SP correctly Techlive Zheng (1): contrib/subtree: use %B for split subject/body Ted Zlatanov (1): Update CodingGuidelines for Perl Thomas Ackermann (5): Documentation: avoid poor-man's small caps GIT Documentation: the name of the system is 'Git', not 'git' Documentation: do not use undefined terms git-dir and git-file Documentation: add a description for 'gitfile' to glossary Documentation: StGit is the right spelling, not StGIT Torsten Bögershausen (9): t9402: sed -i is not portable t9402: improve check_end_tree() and check_end_full_tree() t9402: Dont use test_must_fail cvs t9402: No space after IO-redirection t9402: Add missing &&; Code style t9402: Simplify git ls-tree t9402: Rename check.cvsCount and check.list t9402: Use TABs for indentation test: Add check-non-portable-shell.pl Tran Ngoc Quan (1): l10n: vi.po: updated Vietnamese translation W. Trevor King (3): submodule: add get_submodule_config helper funtion submodule update: add --remote for submodule's upstream changes submodule add: If --branch is given, record it in .gitmodules Wang Sheng (1): l10n: zh_CN.po: 800+ new translations on command usages Version v1.8.1.6; changes since v1.8.1.5: ----------------------------------------- Antoine Pelisse (4): update-index: allow "-h" to also display options diff: Fix rename pretty-print when suffix and prefix overlap tests: make sure rename pretty print works perf: update documentation of GIT_PERF_REPEAT_COUNT Christian Helmuth (1): git-commit doc: describe use of multiple `-m` options Dan Bornstein (1): Correct the docs about GIT_SSH. David Michael (1): git-compat-util.h: Provide missing netdb.h definitions Fredrik Gustafsson (1): gitweb/README: remove reference to git.kernel.org Greg Price (1): describe: Document --match pattern format Jeff King (6): avoid segfaults on parse_object failure use parse_object_or_die instead of die("bad object") pack-refs: write peeled entry for non-tags dir.c::match_pathname(): adjust patternlen when shifting pattern dir.c::match_pathname(): pay attention to the length of string parameters t: check that a pattern without trailing slash matches a directory Johannes Sixt (1): t2003: work around path mangling issue on Windows John Keeping (3): t2003: modernize style entry: fix filter lookup merge-tree: fix typo in merge-tree.c::unresolved Joshua Clayton (1): Git.pm: fix cat_blob crashes on large files Junio C Hamano (8): imap-send: support Server Name Indication (RFC4366) diff-options: unconfuse description of --color Documentation: merging a tag is a special case attr.c::path_matches(): the basename is part of the pathname attr.c::path_matches(): special case paths that end with a slash dir.c::match_basename(): pay attention to the length of string parameters Start preparing for 1.8.1.6 Git 1.8.1.6 Kacper Kornet (3): rev-parse: clarify documentation of $name@{upstream} syntax t1507: Test that branchname@{upstream} is interpreted as branch Fix revision walk for commits with the same dates Karsten Blees (1): name-hash.c: fix endless loop with core.ignorecase=true Kevin Bracey (2): Translate git_more_info_string consistently git.c: make usage match manual page Lukas Fleischer (2): bundle: Fix "verify" output if history is complete bundle: Add colons to list headings in "verify" Matthias Krüger (1): git help config: s/insn/instruction/ Michael Haggerty (2): Provide a mechanism to turn off symlink resolution in ceiling paths pack-refs: add fully-peeled trait Mihai Capotă (1): git-pull doc: fix grammo ("conflicts" is plural) Nguyễn Thái Ngọc Duy (4): index-format.txt: mention of v4 is missing in some places read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() update-index: list supported idx versions and their features index-pack: fix buffer overflow caused by translations René Scharfe (2): Makefile: keep LIB_H entries together and sorted sha1_name: pass object name length to diagnose_invalid_sha1_path() Tadeusz Andrzej Kadłubowski (2): git-filter-branch.txt: clarify ident variables usage Documentation: filter-branch env-filter example Thomas Rast (2): diff: prevent pprint_rename from underrunning input git-tag(1): we tag HEAD by default Torsten Bögershausen (1): remote-helpers/test-bzr.sh: do not use "grep '\s'" W. Trevor King (1): Documentation/githooks: Explain pre-rebase parameters Version v1.8.1.5; changes since v1.8.1.4: ----------------------------------------- Andrej E Baranov (1): gitweb: refer to picon/gravatar images over the same scheme Andrew Wong (1): Documentation/githooks: Fix linkgit Asheesh Laroia (1): git-mergetool: print filename when it contains % Ben Walton (3): Move Git::SVN::get_tz to Git::get_tz_offset perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases cvsimport: format commit timestamp ourselves without using strftime Brad King (1): Documentation/submodule: Add --force to update synopsis David Aguilar (3): mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder difftool--helper: fix printf usage p4merge: fix printf usage Erik Faye-Lund (1): parse-options: report uncorrupted multi-byte options Greg Price (1): Documentation: "advice" is uncountable Jeff King (2): http_request: reset "type" strbuf before adding Makefile: avoid infinite loop on configure.ac change Jiang Xin (1): Add utf8_fprintf helper that returns correct number of columns John Keeping (3): Rename {git- => git}remote-helpers.txt builtin/apply: tighten (dis)similarity index parsing t4038: add tests for "diff --cc --raw " Junio C Hamano (7): doc: mention tracking for pull.default combine-diff: lift 32-way limit of combined diff t5551: fix expected error output user-manual: typofix (ofthe->of the) Prepare for 1.8.1.5 Update draft release notes to 1.8.1.5 Git 1.8.1.5 Matthieu Moy (1): git.txt: update description of the configuration mechanism Michael J Gruber (1): git-bisect.txt: clarify that reset quits bisect Nguyễn Thái Ngọc Duy (1): clone: forbid --bare --separate-git-dir Shawn O. Pearce (1): Verify Content-Type from smart HTTP servers Thomas Rast (1): Make !pattern in .gitattributes non-fatal W. Trevor King (4): user-manual: Update for receive.denyCurrentBranch=refuse user-manual: Reorganize the reroll sections, adding 'git rebase -i' user-manual: Use request-pull to generate "please pull" text user-manual: Flesh out uncommitted changes and submodule updates Zoltan Klinger (1): git-clean: Display more accurate delete messages Version v1.8.1.4; changes since v1.8.1.3: ----------------------------------------- Junio C Hamano (2): imap-send: move #ifdef around Git 1.8.1.4 Matthieu Moy (1): Replace filepattern with pathspec for consistency Oswald Buddenhagen (2): imap-send: the subject of SSL certificate must match the host imap-send: support subjectAltName as well W. Trevor King (9): user-manual: Fix 'both: so' -> 'both; so' typo user-manual: Fix 'http' -> 'HTTP' typos user-manual: Fix 'you - Git' -> 'you--Git' typo user-manual: Rewrite git-gc section for automatic packing user-manual: use 'remote add' to setup push URLs user-manual: give 'git push -f' as an alternative to +master user-manual: mention 'git remote add' for remote branch config user-manual: use 'git config --global user.*' for setup user-manual: use -o latest.tar.gz to create a gzipped tarball Version v1.8.1.3; changes since v1.8.1.2: ----------------------------------------- Brandon Casey (3): git-completion.bash: replace zsh notation that breaks bash 3.X git-p4.py: support Python 2.5 git-p4.py: support Python 2.4 Dmitry V. Levin (1): am: invoke perl's strftime in C locale Fraser Tweedale (1): push: fix segfault when HEAD points nowhere John Keeping (1): git-cvsimport.txt: cvsps-2 is deprecated Jonathan Nieder (2): ident: do not drop username when reading from /etc/mailname Makefile: explicitly set target name for autogenerated dependencies Junio C Hamano (17): Which merge_file() function do you mean? merge-tree: lose unused "flags" from merge_list merge-tree: lose unused "resolve_directories" merge-tree: add comments to clarify what these functions are doing merge-tree: fix d/f conflicts Documentation: update "howto maintain git" howto/maintain: mark titles for asciidoc help: include only in one file t9902: protect test from stray build artifacts howto/maintain: document "### match next" convention in jch/pu branch README: update stale and/or incorrect information INSTALL: git-p4 does not support Python 3 git-am: record full index line in the patch used while rebasing apply: simplify build_fake_ancestor() apply: diagnose incomplete submodule object name better Start preparing for 1.8.1.3 Git 1.8.1.3 Martin von Zweigbergk (2): tests: move test_cmp_rev to test-lib-functions learn to pick/revert into unborn branch Nguyễn Thái Ngọc Duy (4): attr: fix off-by-one directory component length calculation test-lib.sh: unfilter GIT_PERF_* attr: avoid calling find_basename() twice per path branch: no detached HEAD check when editing another branch's description Phil Hord (1): rebase --preserve-merges: keep all merge commits including empty ones Ramsay Allan Jones (1): Makefile: Replace merge-file.h with merge-blobs.h in LIB_H Stephen Boyd (1): gpg: close stderr once finished with it in verify_signed_buffer() Torsten Bögershausen (3): t0050: known breakage vanished in merge (case change) t0050: honor CASE_INSENSITIVE_FS in add (with different case) t0050: Use TAB for indentation Version v1.8.1.2; changes since v1.8.1.1: ----------------------------------------- Antoine Pelisse (3): dir.c: Make git-status --ignored more consistent git-status: Test --ignored behavior status: always report ignored tracked directories Dylan Smith (1): git-completion.bash: silence "not a valid object" errors Eric S. Raymond (1): Remove the suggestion to use parsecvs, which is currently broken. John Keeping (1): git-for-each-ref.txt: 'raw' is a supported date format Jonathan Nieder (1): contrib/vim: simplify instructions for old vim support Junio C Hamano (2): Start preparing for 1.8.1.2 Git 1.8.1.2 Marc Khouzam (1): Prevent space after directories in tcsh completion Michael Haggerty (8): Introduce new static function real_path_internal() real_path_internal(): add comment explaining use of cwd Introduce new function real_path_if_valid() longest_ancestor_length(): use string_list_split() longest_ancestor_length(): take a string_list argument for prefixes longest_ancestor_length(): require prefix list entries to be normalized setup_git_directory_gently_1(): resolve symlinks in ceiling paths string_list_longest_prefix(): remove function Nguyễn Thái Ngọc Duy (1): attr: make it build with DEBUG_ATTR again Nickolai Zeldovich (1): git-send-email: treat field names as case-insensitively Peter Eisentraut (1): git-commit-tree(1): correct description of defaults René Scharfe (5): archive-zip: write uncompressed size into header even with streaming t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead t0024, t5000: use test_lazy_prereq for UNZIP t5000, t5003: move ZIP tests into their own script t5003: check if unzip supports symlinks Sebastian Staudt (1): config.txt: Document help.htmlpath config parameter Version v1.8.1.1; changes since v1.8.1: --------------------------------------- Aaron Schrab (1): Use longer alias names in subdirectory tests Adam Spiers (1): api-allocation-growing.txt: encourage better variable naming Antoine Pelisse (1): merge: Honor prepare-commit-msg return code Christian Couder (1): Makefile: detect when PYTHON_PATH changes Jean-Noël AVILA (1): Add directory pattern matching to attributes Jeff King (9): run-command: drop silent_exec_failure arg from wait_or_whine launch_editor: refactor to use start/finish_command run-command: do not warn about child death from terminal launch_editor: propagate signals from editor to git completion: complete refs for "git commit -c" refs: do not use cached refs in repack_without_ref tests: turn on test-lint by default fix compilation with NO_PTHREADS run-command: encode signal death as a positive integer Jens Lehmann (1): clone: support atomic operation with --separate-git-dir John Keeping (4): git-fast-import(1): remove duplicate '--done' option git-shortlog(1): document behaviour of zero-width wrap git-fast-import(1): combine documentation of --[no-]relative-marks git-fast-import(1): reorganise options Jonathan Nieder (6): config, gitignore: failure to access with ENOTDIR is ok config: treat user and xdg config permission problems as errors doc: advertise GIT_CONFIG_NOSYSTEM config: exit on error accessing any config file build: do not automatically reconfigure unless configure.ac changed docs: manpage XML depends on asciidoc.conf Junio C Hamano (20): apply.c:update_pre_post_images(): the preimage can be truncated format_commit_message(): simplify calls to logmsg_reencode() sh-setup: work around "unset IFS" bug in some shells fetch: ignore wildcarded refspecs that update local symbolic refs xmkstemp(): avoid showing truncated template more carefully t0200: "locale" may not exist t9502: do not assume GNU tar t4014: fix arguments to grep t3600: Avoid "cp -a", which is a GNUism t9020: use configured Python to run the test helper compat/fnmatch: update old-style definition to ANSI t9200: let "cvs init" create the test repository merge --no-edit: do not credit people involved in the side branch SubmittingPatches: who am I and who cares? SubmittingPatches: mention subsystems with dedicated repositories Documentation: full-ness of a bundle is significant for cloning SubmittingPatches: remove overlong checklist SubmittingPatches: give list and maintainer addresses Prepare for 1.8.1.1 Git 1.8.1.1 Kirill Brilliantov (1): Documentation: correct example restore from bundle Mark Levedahl (1): Makefile: add comment on CYGWIN_V15_WIN32API Matthew Daley (1): gitweb: Sort projects with undefined ages last Max Horn (1): configure.ac: fix pthreads detection on Mac OS X Michael Schubert (2): git-subtree: ignore git-subtree executable git-subtree: fix typo in manpage Michał Kiedrowicz (1): graph.c: infinite loop in git whatchanged --graph -m Nguyễn Thái Ngọc Duy (4): cache-tree: remove dead i-t-a code in verify_cache() cache-tree: replace "for" loops in update_one with "while" loops cache-tree: fix writing cache-tree when CE_REMOVE is present cache-tree: invalidate i-t-a paths after generating trees Orgad Shaneh (1): gitweb: fix error in sanitize when highlight is enabled Paul Fox (1): launch_editor: ignore terminal signals while editor has control Rene Bredlau (1): http.c: Avoid username prompt for certifcate credentials René Scharfe (2): archive-tar: split long paths more carefully t1402: work around shell quoting issue on NetBSD Sebastian Schuberth (1): nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2 Steffen Prohaska (2): shortlog: fix wrapping lines of wraplen strbuf_add_wrapped*(): Remove unused return value Sven Strickroth (3): git-svn, perl/Git.pm: add central method for prompting passwords perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set git-svn, perl/Git.pm: extend and use Git->prompt method for querying users Thomas Ackermann (1): Remove Documentation/pt_BR/gittutorial.txt Torsten Bögershausen (2): t9810: Do not use sed -i t9020: which is not portable W. Trevor King (1): remote-hg: Fix biridectionality -> bidirectionality typos Version v1.8.1; changes since v1.8.1-rc3: ----------------------------------------- Junio C Hamano (3): git(1): show link to contributor summary page Git 1.8.0.3 Git 1.8.1 Max Horn (1): git-remote-helpers.txt: document invocation before input format Ramkumar Ramachandra (1): Documentation: move diff.wordRegex from config.txt to diff-config.txt Sebastian Leske (4): git-svn: Document branches with at-sign(@). git-svn: Recommend use of structure options. git-svn: Expand documentation for --follow-parent git-svn: Note about tags. Simon Oosthoek (1): make __git_ps1 accept a third parameter in pcmode Thomas Ackermann (1): Sort howto documents in howto-index.txt Version v1.8.1-rc3; changes since v1.8.1-rc2: --------------------------------------------- Adam Spiers (2): SubmittingPatches: add convention of prefixing commit messages Documentation: move support for old compilers to CodingGuidelines Chris Rorvick (2): Documentation/git-checkout.txt: clarify usage Documentation/git-checkout.txt: document 70c9ac2 behavior Jeff King (5): .mailmap: match up some obvious names/emails .mailmap: fix broken entry for Martin Langhoff .mailmap: normalize emails for Jeff King .mailmap: normalize emails for Linus Torvalds contrib: update stats/mailmap script John Keeping (1): Documentation: don't link to example mail addresses Junio C Hamano (5): fetch --tags: clarify documentation README: it does not matter who the current maintainer is t7004: do not create unneeded gpghome/gpg.conf when GPG is not used Documentation: Describe "git diff " separately Git 1.8.1-rc3 Nguyễn Thái Ngọc Duy (1): index-format.txt: clarify what is "invalid" Sebastian Leske (4): git-svn: Document branches with at-sign(@). git-svn: Recommend use of structure options. git-svn: Expand documentation for --follow-parent git-svn: Note about tags. Sitaram Chamarty (1): clarify -M without % symbol in diff-options Stefano Lattarini (1): README: Git is released under the GPLv2, not just "the GPL" Thomas Ackermann (3): Remove misleading date from api-index-skel.txt Remove duplicate entry in ./Documentation/Makefile Move ./technical/api-command.txt to ./howto/new-command.txt Version v1.8.1-rc2; changes since v1.8.1-rc1: --------------------------------------------- Anders Kaseorg (1): git-prompt: Document GIT_PS1_DESCRIBE_STYLE Erik Faye-Lund (7): mingw: correct exit-code for SIGALRM's SIG_DFL mingw: make fgetc raise SIGINT if apropriate compat/terminal: factor out echo-disabling compat/terminal: separate input and output handles mingw: reuse tty-version of git_terminal_prompt mingw: get rid of getpass implementation mingw_rmdir: do not prompt for retry when non-empty Jeff King (1): remote-testsvn: fix unitialized variable Junio C Hamano (5): git(1): remove a defunct link to "list of authors" Git 1.8.0.2 git-prompt.sh: update PROMPT_COMMAND documentation git(1): show link to contributor summary page Git 1.8.1-rc2 Manlio Perillo (1): git.txt: add missing info about --git-dir command-line option Marc Khouzam (1): Add file completion to tcsh git completion. Matthew Daley (1): Fix sizeof usage in get_permutations Max Horn (6): git-remote-helpers.txt: document invocation before input format git-remote-helpers.txt: document missing capabilities git-remote-helpers.txt: minor grammar fix git-remote-helpers.txt: rearrange description of capabilities git-remote-helpers.txt: clarify command <-> capability correspondences git-remote-helpers.txt: clarify options & ref list attributes Stefano Lattarini (1): Makefile: whitespace style fixes in macro definitions Sébastien Loriot (1): Documentation/git-stash.txt: add a missing verb Thomas Ackermann (1): Renumber list in api-command.txt Version v1.8.1-rc1; changes since v1.8.1-rc0: --------------------------------------------- Jiang Xin (1): l10n: Update git.pot (5 new, 1 removed messages) Junio C Hamano (3): Update draft release notes to 1.8.0.2 Documentation/diff-config: work around AsciiDoc misfortune Git 1.8.1-rc1 Matthieu Moy (1): document that statusHints affects git checkout Peter Krefting (1): l10n: Update Swedish translation (1979t0f0u) Ralf Thielow (2): l10n: de.po: translate 825 new messages l10n: de.po: translate 22 new messages Ramkumar Ramachandra (4): t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs t4041 (diff-submodule-option): parse digests sensibly t4041 (diff-submodule-option): rewrite add_file() routine t4041 (diff-submodule-option): modernize style Tran Ngoc Quan (1): l10n: vi.po: update to git-v1.8.0.1-347-gf94c3 Version v1.8.1-rc0; changes since v1.8.0.3: ------------------------------------------- Ben Walton (1): Use character class for sed expression instead of \s Brandon Casey (1): usage.c: detect recursion in die routines and bail out immediately Chris Rorvick (1): git-cvsimport: allow author-specific timezones Dmitry Ivankov (1): vcs-svn: add fast_export_note to create notes Enrico Scholz (1): emacs: make 'git-status' work with separate git dirs Eric S. Raymond (1): Documentation: how to add a new command Felipe Contreras (32): completion: add format-patch options to send-email Add new remote-hg transport helper remote-hg: add support for pushing remote-hg: add support for remote pushing remote-hg: add support to push URLs remote-hg: make sure the encoding is correct remote-hg: match hg merge behavior remote-hg: add support for hg-git compat mode remote-hg: add compat for hg-git author fixes remote-hg: fake bookmark when there's none remote-hg: add basic tests test-lib: avoid full path to store test results remote-hg: add bidirectional tests remote-hg: add tests to compare with hg-git remote-hg: add extra author test remote-hg: add option to not track branches remote-hg: the author email can be null remote-hg: fix compatibility with older versions of hg remote-hg: try the 'tip' if no checkout present remote-hg: avoid bad refs completion: add comment for test_completion() completion: standardize final space marker in tests completion: simplify tests using test_completion_long() completion: consolidate test_completion*() tests completion: refactor __gitcomp related tests completion: simplify __gitcomp() test helper completion: add new zsh completion completion: start moving to the new zsh completion send-email: avoid questions when user has an ident remote-hg: fix for files with spaces remote-hg: fix for older versions of python completion: fix warning for zsh Florian Achleitner (15): Implement a remote helper for svn in C Add git-remote-testsvn to Makefile Add svndump_init_fd to allow reading dumps from arbitrary FDs Add argv_array_detach and argv_array_free_detached Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability Add documentation for the 'bidi-import' capability of remote-helpers When debug==1, start fast-import with "--stats" instead of "--quiet" remote-svn, vcs-svn: Enable fetching to private refs Allow reading svn dumps from files via file:// urls Create a note for every imported commit containing svn metadata remote-svn: Activate import/export-marks for fast-import remote-svn: add incremental import Add a svnrdump-simulator replaying a dump file for testing remote-svn: add marks-file regeneration Add a test script for remote-svn Jeff King (30): pager: drop "wait for output to run less" hack peel_ref: use faster deref_tag_noverify peel_ref: do not return a null sha1 peel_ref: check object type before loading upload-pack: use peel_ref for ref advertisements remote-curl: do not call run_slot repeatedly http: do not set up curl auth after a 401 strbuf: always return a non-NULL value from strbuf_detach status: add --long output format option git-sh-setup: refactor ident-parsing functions filter-branch: use git-sh-setup's ident parsing functions t1300: style updates t1300: remove redundant test t1300: test "git config --get-all" more thoroughly git-config: remove memory leak of key regexp git-config: fix regexp memory leaks on error conditions git-config: collect values instead of immediately printing git-config: do not complain about duplicate entries git-config: use git_config_with_options remote-curl: hoist gzip buffer size to top of post_rpc remote-curl: retry failed requests for auth even with gzip cvsimport: work around perl tzset issue test-lib: allow negation of prerequisites t7502: factor out autoident prerequisite ident: make user_ident_explicitly_given static ident: keep separate "explicit" flags for author and committer diff: rename "set" variable t: add tests for "git var" t9001: check send-email behavior with implicit sender status: respect advice.statusHints for ahead/behind advice Jeff Muizelaar (1): diff: diff.context configuration gives default to -U Jens Lehmann (5): submodule: teach rm to remove submodules unless they contain a git directory Teach "git submodule add" the --name option submodule add: Fail when .git/modules/ already exists unless forced submodule status: remove unused orig_* variables Teach rm to remove submodules when given with a trailing '/' Jiang Xin (1): l10n: Update git.pot (14 new, 3 removed messages) Joachim Schmitz (1): fix 'make test' for HP NonStop Johan Herland (1): git symbolic-ref --delete $symref Johannes Sixt (1): maybe_flush_or_die: move a too-loose Windows specific error Junio C Hamano (20): t4055: avoid use of sed 'a' command log --grep: accept --basic-regexp and --perl-regexp log: honor grep.* configuration coloured git-prompt: paint detached HEAD marker in red pretty: remove reencode_commit_message() format_note(): simplify API pretty: prepare notes message at a centralized place pretty_print_commit(): do not append notes message format-patch: append --signature after notes format-patch --notes: show notes after three-dashes Documentation: decribe format-patch --notes get_fetch_map(): tighten checks on dest refs format-patch: add a blank line between notes and diffstat Start 1.8.1 cycle Sixth batch for 1.8.1 Update draft release notes for 1.8.1 Update draft release notes to 1.8.1 Update draft release notes to 1.8.1 Update draft release notes to 1.8.1 Git 1.8.1-rc0 Karsten Blees (1): update-index/diff-index: use core.preloadindex to improve performance Krzysztof Mazur (10): git-send-email: introduce compose-encoding git-send-email: use compose-encoding for Subject git-send-email: skip RFC2047 quoting for ASCII subjects git-send-email: introduce quote_subject() git-send-email: add rfc2047 quoting for "=?" git-send-email: remove garbage after email address git-send-email: fix fallback code in extract_valid_address() git-send-email: remove invalid addresses earlier git-send-email: ask what to do with an invalid email address git-send-email: allow edit invalid email address Marc Khouzam (2): tcsh-completion re-using git-completion.bash Support for git aliasing for tcsh completion Mark Levedahl (2): Update cygwin.c for new mingw-64 win32 api headers USE CGYWIN_V15_WIN32API as macro to select api for cygwin Matt Kraai (1): docs: move submodule section Matthew Ogilvie (10): cvsserver t9400: add basic 'cvs log' test cvsserver: removed unused sha1Or-k mode from kopts_from_path cvsserver: add comments about database schema/usage cvsserver update: comment about how we shouldn't remove a user-modified file cvsserver: remove unused functions _headrev and gethistory cvsserver: clean up client request handler map comments cvsserver: split up long lines in req_{status,diff,log} cvsserver: use whole CVS rev number in-process; don't strip "1." prefix cvsserver: cvs add: do not expand directory arguments cvsserver status: provide real sticky info Matthieu Moy (1): status: add advice on how to push/pull to tracking branch Michael Haggerty (12): parse_dirstat_params(): use string_list to split comma-separated string strbuf_split_buf(): use ALLOC_GROW() strbuf_split_buf(): simplify iteration strbuf_split*(): rename "delim" parameter to "terminator" strbuf_split*(): document functions string_list: add a function string_list_remove_empty_items() Initialize sort_uniq_list using named constant combine_notes_cat_sort_uniq(): sort and dedup lines all at once notes: fix handling of colon-separated values string_list_add_refs_from_colon_sep(): use string_list_split() link_alt_odb_entries(): use string_list_split_in_place() link_alt_odb_entries(): take (char *, len) rather than two pointers Michael J Gruber (1): replace: parse revision argument for -d Nguyễn Thái Ngọc Duy (16): attr: avoid strlen() on every match attr: avoid searching for basename on every match exclude: stricten a length check in EXC_FLAG_ENDSWITH case exclude: split basename matching code into a separate function exclude: fix a bug in prefix compare optimization exclude: split pathname matching code into a separate function gitignore: make pattern parsing code a separate function attr: more matching optimizations from .gitignore tree-walk: use enum interesting instead of integer Move try_merge_command and checkout_fast_forward to libgit.a Move estimate_bisect_steps to libgit.a Move print_commit_list to libgit.a Move setup_diff_pager to libgit.a send-pack: move core code to libgit.a fetch-pack: remove global (static) configuration variable "args" fetch-pack: move core code to libgit.a Patrick Palka (1): Documentation: improve the example of overriding LESS via core.pager Pete Wyckoff (6): git p4: catch p4 describe errors git p4: handle servers without move support git p4: catch p4 errors when streaming file contents git p4 test: display unresolvable host error git p4: fix labelDetails typo in exception git p4: remove unneeded cmd initialization Peter Krefting (1): l10n: Update Swedish translation (1975t0f0u) Phil Hord (3): t7407: Fix recursive submodule test Teach --recursive to submodule sync Add tests for submodule sync --recursive Phil Pennock (1): gitweb: make remote_heads config setting work Philip Oakley (4): Doc SubmittingPatches: Mention --notes option after "cover letter" Doc notes: Include the format-patch --notes option Doc format-patch: clarify --notes use case Doc User-Manual: Patch cover letter, three dashes, and --notes Ramkumar Ramachandra (4): remote-hg: add missing config for basic tests Documentation: move diff.wordRegex from config.txt to diff-config.txt diff: introduce diff.submodule configuration variable submodule: display summary header in bold Ramsay Allan Jones (2): builtin/config.c: Fix a sparse warning remote-curl.c: Fix a compiler warning SZEDER Gábor (1): completion: remove 'help' duplicate from porcelain commands Simon Oosthoek (3): Allow __git_ps1 to be used in PROMPT_COMMAND show color hints based on state of the git tree Fix up colored git-prompt Stefan Zager (1): submodule add: fix handling of --reference= option Stefano Lattarini (1): configure: fix some output message Torsten Bögershausen (1): Fix t9200 on case insensitive file systems Tran Ngoc Quan (2): l10n: vi.po: update to git-v1.7.12-437-g1084f l10n: vi.po: Update follow git-v1.8.0-273-g2d242 Version v1.8.0.3; changes since v1.8.0.2: ----------------------------------------- Adam Spiers (2): SubmittingPatches: add convention of prefixing commit messages Documentation: move support for old compilers to CodingGuidelines Anders Kaseorg (1): git-prompt: Document GIT_PS1_DESCRIBE_STYLE Chris Rorvick (2): Documentation/git-checkout.txt: clarify usage Documentation/git-checkout.txt: document 70c9ac2 behavior Gunnlaugur Þór Briem (1): Document git-svn fetch --log-window-size parameter Jeff King (7): pickaxe: hoist empty needle check pickaxe: use textconv for -S counting .mailmap: match up some obvious names/emails .mailmap: fix broken entry for Martin Langhoff .mailmap: normalize emails for Jeff King .mailmap: normalize emails for Linus Torvalds contrib: update stats/mailmap script John Keeping (1): Documentation: don't link to example mail addresses Junio C Hamano (6): fetch --tags: clarify documentation README: it does not matter who the current maintainer is t7004: do not create unneeded gpghome/gpg.conf when GPG is not used Documentation: Describe "git diff " separately git(1): show link to contributor summary page Git 1.8.0.3 Krzysztof Mazur (1): doc: git-reset: make "" optional Manlio Perillo (1): git.txt: add missing info about --git-dir command-line option Matthew Daley (1): Fix sizeof usage in get_permutations Max Horn (1): git-remote-helpers.txt: document invocation before input format Nguyễn Thái Ngọc Duy (1): index-format.txt: clarify what is "invalid" Ramkumar Ramachandra (1): Documentation: move diff.wordRegex from config.txt to diff-config.txt Sebastian Leske (4): git-svn: Document branches with at-sign(@). git-svn: Recommend use of structure options. git-svn: Expand documentation for --follow-parent git-svn: Note about tags. Sitaram Chamarty (1): clarify -M without % symbol in diff-options Stefano Lattarini (1): README: Git is released under the GPLv2, not just "the GPL" Thomas Ackermann (8): Split over-long synopsis in git-fetch-pack.txt into several lines Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1 Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt Documentation/technical: convert plain text files to asciidoc Documentation/howto: convert plain text files to asciidoc Documentation: build html for all files in technical and howto Remove misleading date from api-index-skel.txt Sort howto documents in howto-index.txt Tom Jones (1): Add -S, --gpg-sign option to manpage of "git commit" Version v1.8.0.2; changes since v1.8.0.1: ----------------------------------------- Antoine Pelisse (1): Fix typo in remote set-head usage Eric S. Raymond (1): doc/fast-import: clarify how content states are built Johan Herland (2): t1400-update-ref: Add test verifying bug with symrefs in delete_ref() Fix failure to delete a packed ref through a symref Junio C Hamano (13): reencode_string(): introduce and use same_encoding() test: add failing tests for "diff --stat" to t4049 diff --stat: status of unmodified pair in diff-q is not zero diff --stat: use "file" temporary variable to refer to data->files[i] diff --stat: move the "total count" logic to the last loop diff --stat: do not count "unmerged" entries diff --shortstat: do not count "unmerged" entries Documentation/git-push.txt: clarify the "push from satellite" workflow Start preparing for 1.8.0.2 t4049: refocus tests Update draft release notes to 1.8.0.2 git(1): remove a defunct link to "list of authors" Git 1.8.0.2 Linus Torvalds (1): Fix "git diff --stat" for interesting - but empty - file changes Mark Szepieniec (1): Documentation: improve phrasing in git-push.txt Matthieu Moy (2): git-remote-mediawiki: escape ", \, and LF in file names git-fast-import.txt: improve documentation for quoted paths Nguyễn Thái Ngọc Duy (1): compat/fnmatch: fix off-by-one character class's length check Paul Gortmaker (1): Makefile: hide stderr of curl-config test Pete Wyckoff (1): git p4: RCS expansion should not span newlines Ralf Thielow (1): completion: add options --single-branch and --branch to "git clone" Richard Hubbell (1): gitweb.perl: fix %highlight_ext mappings Sébastien Loriot (1): Documentation/git-stash.txt: add a missing verb W. Trevor King (1): git-submodule: wrap branch option with "<>" in usage strings. Version v1.8.0.1; changes since v1.8.0: --------------------------------------- Andreas Schwab (1): commit: fixup misplacement of --no-post-rewrite description Ben Walton (1): Remove the hard coded length limit on variable names in config files Carlos Martín Nieto (1): config: don't segfault when given --path with a missing value David Aguilar (1): mergetools/p4merge: Handle "/dev/null" Jan H. Schönherr (7): utf8: fix off-by-one wrapping of text format-patch: do not wrap non-rfc2047 headers too early format-patch: do not wrap rfc2047 encoded headers too late format-patch: introduce helper function last_line_length() format-patch: make rfc2047 encoding more strict format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch tests: check quoting/encoding in To: and Cc: headers Jeff King (3): diff_grep: use textconv buffers for add/deleted files gitweb: escape html in rss title checkout: print a message when switching unborn branches Junio C Hamano (9): builtin/grep.c: make configuration callback more reusable grep: move the configuration parsing logic to grep.[ch] grep: move pattern-type bits support to top-level grep.[ch] revisions: initialize revs->grep_filter using grep_init() log --grep: use the same helper to set -E/-F options as "git grep" test-lib: Fix say_color () not to interpret \a\b\c in the message Start preparing for 1.8.0.1 Further preparation for 1.8.0.1 Git 1.8.0.1 Marc Khouzam (1): Completion must sort before using uniq Matthieu Moy (2): Documentation: remote tracking branch -> remote-tracking branch Document 'git commit --no-edit' explicitly Michael J Gruber (1): push/pull: adjust missing upstream help text to changed interface Nguyễn Thái Ngọc Duy (1): grep: stop looking at random places for .gitattributes Phil Hord (1): git-pull: Avoid merge-base on detached head Philip Oakley (1): Doc repository-layout: Show refs/replace René Scharfe (6): refs: lock symref that is to be deleted, not its target branch: factor out check_branch_commit() branch: factor out delete_branch_config() branch: delete symref branch, not its target branch: skip commit checks when deleting symref branches branch: show targets of deleted symrefs, not sha1s Romain Francoise (1): mailmap: avoid out-of-bounds memory access Stefan Zager (1): Fix potential hang in https handshake Version v1.8.0; changes since v1.8.0-rc3: ----------------------------------------- Andrew Wong (2): git-gui: Detect full path when parsing arguments git-gui: Don't prepend the prefix if value looks like a full path Beat Bolli (2): git-gui: Fix a loose/lose mistake git-gui: remove .git/CHERRY_PICK_HEAD after committing Benjamin Kerensa (1): git-gui: fix a typo in po/ files Clemens Buchacher (1): git-gui: fix git-gui crash due to uninitialized variable Heiko Voigt (1): git-gui: open console when using --trace on windows Junio C Hamano (1): Git 1.8.0 Marcus Karlsson (1): git-gui: Use PWD if it exists on Mac OS X Pat Thoyts (2): git-gui: preserve commit messages in utf-8 git-gui 0.17 Ralf Thielow (3): git-gui: de.po: consistently add untranslated hook names within braces git-gui: de.po: translate "bare" as "bloß" git-gui: de.po: translate "remote" as "extern" Vitaly _Vi Shukela (1): git-gui: Fix semi-working shortcuts for unstage and revert Version v1.8.0-rc3; changes since v1.8.0-rc2: --------------------------------------------- Dylan Alex Simon (1): gitweb.cgi: fix "comitter_tz" typo in feed Jeff King (1): http: fix segfault in handle_curl_result Jiang Xin (1): l10n: Update git.pot (3 new, 6 removed messages) Junio C Hamano (3): Update draft release notes to 1.8.0 Git 1.7.12.4 Git 1.8.0-rc3 Peter Krefting (1): l10n: Update Swedish translation (1964t0f0u) Richard Fearn (1): Fix spelling error in post-receive-email hook Thomas Ackermann (1): Documentation/RelNotes: remove "updated up to this revision" markers Tran Ngoc Quan (2): l10n: vi.po: update translation upto cc76011 l10n: vi.po: update from v1.8.0-rc2-4-g42e55 Version v1.8.0-rc2; changes since v1.8.0-rc1: --------------------------------------------- Ben Walton (1): tests: "cp -a" is a GNUism Jonathan Nieder (2): git svn: work around SVN 1.7 mishandling of svn:special changes svn test: escape peg revision separator using empty peg rev Junio C Hamano (2): gitcli: parse-options lets you omit tail of long options Git 1.8.0-rc2 Nguyễn Thái Ngọc Duy (2): gitignore.txt: suggestions how to get literal # or ! at the beginning attr: a note about the order of .gitattributes lookup Ramkumar Ramachandra (1): Git url doc: mark ftp/ftps as read-only and deprecate them Ramsay Allan Jones (1): MALLOC_CHECK: Allow checking to be disabled from config.mak Simon Ruderich (1): l10n: de.po: fix a few minor typos Øyvind A. Holm (1): configure.ac: Add missing comma to CC_LD_DYNPATH Version v1.8.0-rc1; changes since v1.8.0-rc0: --------------------------------------------- Ammon Riley (1): Make git-svn branch patterns match complete URL Eric Wong (1): git-svn: use path accessor for Git::SVN objects Jonathan Nieder (2): Git::SVN: rename private path field git-svn: keep leading slash when canonicalizing paths (fallback case) Junio C Hamano (7): log --grep-reflog: reject the option without -g Start preparing for 1.7.12.3 t1450: the order the objects are checked is undefined Update draft release notes to 1.8.0 paint_down_to_common(): parse commit before relying on its timestamp Git 1.7.12.3 Git 1.8.0-rc1 Linus Torvalds (1): mailinfo: don't require "text" mime type for attachments Michael J Gruber (1): RelNotes/1.8.0: various typo and style fixes Nguyễn Thái Ngọc Duy (3): grep: prepare for new header field filter revision: add --grep-reflog to filter commits by reflog messages revision: make --grep search in notes too if shown Peter Krefting (1): l10n: Fix to Swedish translation Ramkumar Ramachandra (1): Documentation: mention `push.default` in git-push.txt Robert Luberda (1): t9164: Add missing quotes in test Steven Walter (2): git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip git-svn.perl: keep processing all commits in parents_exclude Tobias Ulmer (1): silence git gc --auto --quiet output Version v1.8.0-rc0; changes since v1.7.12.4: -------------------------------------------- Adrian Johnson (1): Add userdiff patterns for Ada Andrew Wong (3): rebase -i: Refactor help messages for todo file rebase -i: Teach "--edit-todo" action rebase -i: Add tests for "--edit-todo" Aske Olsson (1): gitk: Fix GIT_TRACE issues Carlos Martín Nieto (4): branch: introduce --set-upstream-to branch: add --unset-upstream option branch: deprecate --set-upstream and show help if we detect possible mistaken use completion: add --set-upstream-to and --unset-upstream Chris Webb (1): cherry-pick: add --allow-empty-message option David Aguilar (12): difftool: Simplify print_tool_help() difftool: Eliminate global variables difftool: Move option values into a hash difftool: Call the temp directory "git-difftool" difftool: Use symlinks when diffing against the worktree difftool: Handle finding mergetools/ in a path with spaces difftool: Check all return codes from compare() difftool: Wrap long lines for readability difftool: Handle compare() returning -1 difftool: Disable --symlinks on cygwin mergetool,difftool: Document --tool-help consistently mergetool--lib: Allow custom commands to override built-ins Elia Pinto (1): Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption Erik Faye-Lund (1): contrib: add win32 credential-helper J Smith (1): grep: add a grep.patternType configuration setting Jeff King (4): remote-curl: rename is_http variable remote-curl: let users turn off smart http t9902: add a few basic completion tests t9902: add completion tests for "odd" filenames Jiang Xin (11): Fix tests under GETTEXT_POISON on relative dates Fix tests under GETTEXT_POISON on git-stash Fix tests under GETTEXT_POISON on diffstat Fix tests under GETTEXT_POISON on git-apply Fix tests under GETTEXT_POISON on pack-object Fix tests under GETTEXT_POISON on git-remote Fix tests under GETTEXT_POISON on parseopt l10n: Update git.pot (2 new, 4 removed messages) l10n: zh_CN.po: translate 2 new messages l10n: Update git.pot (825 new, 24 removed messages) l10n: zh.CN.po: msgmerge git.pot (1142t195f630u) Joachim Schmitz (8): compat: some mkdir() do not like a slash at the end Add a no-op setitimer() wrapper Document MKDIR_WO_TRAILING_SLASH in Makefile make poll available for other platforms lacking it fix some win32 specific dependencies in poll.c poll() exits too early with EFAULT if 1st arg is NULL make poll() work on platforms that can't recv() on a non-socket Port to HP NonStop Johannes Sixt (3): t0060: split absolute path test in two to exercise some of it on Windows rebase -i: fix misleading error message after 'exec no-such' instruction rebase -i: suggest using --edit-todo to fix an unknown instruction Junio C Hamano (42): daemon: --access-hook option Kick off cycle towards 1.8.0 First half of the second batch for 1.8.0 in_merge_bases(): support only one "other" commit receive-pack: use in_merge_bases() for fast-forward check http-push: use in_merge_bases() for fast-forward check Latter half of the second batch for 1.8.0 merge_bases_many(): split out the logic to paint history in_merge_bases(): use paint_down_to_common() get_merge_bases_many(): walk from many tips in parallel merge-base: "--is-ancestor A B" reduce_heads(): reimplement on top of remove_redundant() The third batch for 1.8.0 Update mailmap for a handful of folks The fourth batch for 1.8.0 Cull items fixed in maintenance branches First half of the fifth batch for 1.8.0 Second half of the fifth batch for 1.8.0 Start merging the sixth batch for 1.8.0 The sixth batch for 1.8.0 Draft release notes to 1.8.0 builtin/notes.c: mark file-scope private symbols as static commit.c: mark a file-scope private symbol as static diff.c: mark a private file-scope symbol as static graph.c: mark private file-scope symbols as static rerere.c: mark private file-scope symbols as static notes.c: mark a private file-scope symbol as static symlinks.c: mark private file-scope symbols as static sha1-array.c: mark a private file-scope symbol as static strbuf.c: mark a private file-scope symbol as static read-cache.c: mark a private file-scope symbol as static wt-status.c: mark a private file-scope symbol as static trace.c: mark a private file-scope symbol as static ident.c: mark private file-scope symbols as static sequencer.c: mark a private file-scope symbol as static The seventh batch for 1.8.0 MALLOC_CHECK: various clean-ups Revert "archive-zip: support UTF-8 paths" Update draft release notes to 1.8.0 Update draft release notes to 1.8.0 Update draft release notes to 1.8.0 Git 1.8.0-rc0 Ken Dreyer (1): cvsimport: strip all inappropriate tag strings Linus Torvalds (1): commit/commit-tree: correct latin1 to utf-8 Martin von Zweigbergk (4): remove unnecessary parameter from get_patch_ids() cherry: don't set ignored rev_info options cherry: remove redundant check for merge commit rebase usage: subcommands can not be combined with -i Matthieu Moy (1): push: start warning upcoming default change for push.default Michael G. Schwern (20): Git::SVN: use accessors internally for path Git::SVN: use accessor for URLs internally Git::SVN::Ra: use accessor for URLs use Git::SVN->path accessor globally use Git::SVN{,::RA}->url accessor globally git-svn: move canonicalization to Git::SVN::Utils git-svn: use SVN 1.7 to canonicalize when possible git-svn: factor out _collapse_dotdot function git-svn: add join_paths() to safely concatenate paths Git::SVN::Utils: remove irrelevant comment git-svn: path canonicalization uses SVN API Git::SVN{,::Ra}: canonicalize earlier t9118: workaround inconsistency between SVN versions t9107: fix typo git-svn: attempt to mimic SVN 1.7 URL canonicalization git-svn: replace URL escapes with canonicalization git-svn: canonicalize earlier git-svn: introduce add_path_to_url function git-svn: canonicalize newly-minted URLs git-svn: remove ad-hoc canonicalizations Michael Haggerty (29): t0060: move tests of real_path() from t0000 to here t0060: verify that absolute_path() fails if passed the empty string absolute_path(): reject the empty string t0060: verify that real_path() fails if passed the empty string real_path(): reject the empty string t0060: verify that real_path() works correctly with absolute paths real_path(): properly handle nonexistent top-level paths t0060: verify that real_path() removes extra slashes string_list: add function string_list_append_nodup() string_list: add two new functions for splitting strings string_list: add a new function, filter_string_list() string_list: add a new function, string_list_remove_duplicates() string_list: add a function string_list_longest_prefix() api-string-list.txt: initialize the string_list the easy way t5500: add tests of error output for missing refs t5500: add tests of fetch-pack --all --depth=N $URL $REF Rename static function fetch_pack() to http_fetch_pack() fetch_pack(): reindent function decl and defn Change fetch_pack() and friends to take string_list arguments filter_refs(): do not check the same sought_pos twice fetch_pack(): update sought->nr to reflect number of unique entries filter_refs(): delete matched refs from sought list filter_refs(): build refs list as we go filter_refs(): simplify logic cmd_fetch_pack(): return early if finish_connect() fails fetch-pack: report missing refs even if no existing refs were received cmd_fetch_pack(): simplify computation of return value fetch-pack: eliminate spurious error messages string_list API: document what "sorted" means Michael J Gruber (1): completion: complete branch name for "branch --set-upstream-to=" Miklos Vajna (1): cherry-pick: don't forget -s on failure Nguyễn Thái Ngọc Duy (74): i18n: mark "style" in OPT_COLUMN() for translation i18n: archive: mark parseopt strings for translation i18n: bisect--helper: mark parseopt strings for translation i18n: add: mark parseopt strings for translation i18n: blame: mark parseopt strings for translation i18n: branch: mark parseopt strings for translation i18n: cat-file: mark parseopt strings for translation i18n: check-attr: mark parseopt strings for translation i18n: checkout-index: mark parseopt strings for translation i18n: checkout: mark parseopt strings for translation i18n: cherry: mark parseopt strings for translation i18n: clean: mark parseopt strings for translation i18n: clone: mark parseopt strings for translation i18n: column: mark parseopt strings for translation i18n: commit: mark parseopt strings for translation i18n: count-objects: mark parseopt strings for translation i18n: config: mark parseopt strings for translation i18n: describe: mark parseopt strings for translation i18n: fast-export: mark parseopt strings for translation i18n: fetch: mark parseopt strings for translation i18n: fmt-merge-msg: mark parseopt strings for translation i18n: for-each-ref: mark parseopt strings for translation i18n: format-patch: mark parseopt strings for translation i18n: fsck: mark parseopt strings for translation i18n: gc: mark parseopt strings for translation i18n: grep: mark parseopt strings for translation i18n: hash-object: mark parseopt strings for translation i18n: help: mark parseopt strings for translation i18n: init-db: mark parseopt strings for translation i18n: log: mark parseopt strings for translation i18n: ls-files: mark parseopt strings for translation i18n: ls-tree: mark parseopt strings for translation i18n: merge-base: mark parseopt strings for translation i18n: merge-file: mark parseopt strings for translation i18n: merge: mark parseopt strings for translation i18n: mktree: mark parseopt strings for translation i18n: mv: mark parseopt strings for translation i18n: name-rev: mark parseopt strings for translation i18n: notes: mark parseopt strings for translation i18n: pack-objects: mark parseopt strings for translation i18n: pack-refs: mark parseopt strings for translation i18n: prune-packed: mark parseopt strings for translation i18n: prune: mark parseopt strings for translation i18n: push: mark parseopt strings for translation i18n: read-tree: mark parseopt strings for translation i18n: remote: mark parseopt strings for translation i18n: replace: mark parseopt strings for translation i18n: status: mark parseopt strings for translation i18n: rerere: mark parseopt strings for translation i18n: reset: mark parseopt strings for translation i18n: rev-parse: mark parseopt strings for translation i18n: revert, cherry-pick: mark parseopt strings for translation i18n: rm: mark parseopt strings for translation i18n: shortlog: mark parseopt strings for translation am: quote string for translation before passing to eval_gettextln i18n: show-branch: mark parseopt strings for translation i18n: show-ref: mark parseopt strings for translation i18n: symbolic-ref: mark parseopt strings for translation i18n: tag: mark parseopt strings for translation i18n: update-index: mark parseopt strings for translation i18n: update-ref: mark parseopt strings for translation i18n: update-server-info: mark parseopt strings for translation i18n: verify-pack: mark parseopt strings for translation i18n: verify-tag: mark parseopt strings for translation i18n: write-tree: mark parseopt strings for translation Reduce translations by using same terminologies Use imperative form in help usage to describe an action branch -v: align even when branch names are in UTF-8 checkout: pass "struct checkout_opts *" as const pointer checkout: move more parameters to struct checkout_opts i18n: mark more index-pack strings for translation status: remove i18n legos checkout: reorder option handling fetch: align per-ref summary report in UTF-8 locales Pete Wyckoff (17): git p4 test: move client_view() function to library git p4 test: add broken --use-client-spec --detect-branches tests git p4: set self.branchPrefixes in initialization git p4: do wildcard decoding in stripRepoPath git p4: make branch detection work with --use-client-spec git p4 test: remove bash-ism of combined export/assignment git p4: gracefully fail if some commits could not be applied git p4: remove submit failure options [a]pply and [w]rite git p4: move conflict prompt into run, add [q]uit input git p4: standardize submit cancel due to unchanged template git p4: test clean-up after failed submit, fix added files git p4: rearrange submit template construction git p4: revert deleted files after submit cancel git p4: accept -v for --verbose git p4: add submit --dry-run option git p4: add submit --prepare-p4-only option git-p4: add submit --conflict option and config varaiable Peter Krefting (3): l10n: Update Swedish translation (1166t0f0u) Update Swedish translation (1967t0f0u) l10n: Fixes to Swedish translation Philipp A. Hartmann (1): contrib: add credential helper for GnomeKeyring Ralf Thielow (1): l10n: de.po: translate 2 new messages Ramsay Allan Jones (12): t3300-*.sh: Fix a TAP parse error t3902-*.sh: Skip all tests rather than each test t4016-*.sh: Skip all tests rather than each test test-lib.sh: Fix some shell coding style violations test-lib.sh: Add check for invalid use of 'skip_all' facility test-lib.sh: Suppress the "passed all ..." message if no tests run path.c: Remove the 'git_' prefix from a file scope function path.c: Don't discard the return value of vsnpath() path.c: Use vsnpath() in the implementation of git_path() Call git_pathdup() rather than xstrdup(git_path("...")) Call mkpathdup() rather than xstrdup(mkpath(...)) test-string-list.c: Fix some sparse warnings René Scharfe (4): archive-zip: support UTF-8 paths archive-zip: support UTF-8 paths archive-zip: write extended timestamp MALLOC_CHECK: enable it, unless disabled explicitly Ross Lagerwall (1): difftool: silence warning Sebastian Schuberth (1): Add Code Compare v2.80.4 as a merge / diff tool for Windows Stefano Lattarini (2): build: improve GIT_CONF_SUBST signature build: don't duplicate substitution of make variables Thomas Rast (2): gettext: do not translate empty string in_merge_bases(): omit unnecessary redundant common ancestor reduction Tran Ngoc Quan (2): l10n: vi.po & TEAMS: review Vietnamese translation l10n: vi.po: update to v1.7.12-146-g16d26 Version v1.7.12.4; changes since v1.7.12.3: ------------------------------------------- Ben Walton (1): tests: "cp -a" is a GNUism Dave Borowitz (1): Documentation/Makefile: Allow custom XMLTO binary Dylan Alex Simon (1): gitweb.cgi: fix "comitter_tz" typo in feed Jeff King (1): http: fix segfault in handle_curl_result Junio C Hamano (6): merge: teach -Xours/-Xtheirs to binary ll-merge driver attr: "binary" attribute should choose built-in "binary" merge driver ll-merge: warn about inability to merge binary files only when we can't t1450: the order the objects are checked is undefined gitcli: parse-options lets you omit tail of long options Git 1.7.12.4 Nguyễn Thái Ngọc Duy (2): gitignore.txt: suggestions how to get literal # or ! at the beginning attr: a note about the order of .gitattributes lookup Philip Oakley (5): Doc: shallow clone deepens _to_ new depth Doc: separate gitignore pattern sources Doc add: link gitignore Doc clean: add See Also link Doc branch: show -vv option and alternative Ramkumar Ramachandra (3): t/test-lib: make sure Git has already been built test-lib: use $SHELL_PATH, not $SHELL Git url doc: mark ftp/ftps as read-only and deprecate them Richard Fearn (1): Fix spelling error in post-receive-email hook Simon Ruderich (1): l10n: de.po: fix a few minor typos Version v1.7.12.3; changes since v1.7.12.2: ------------------------------------------- Jeff King (3): receive-pack: redirect unpack-objects stdout to /dev/null receive-pack: send pack-processing stderr over sideband receive-pack: drop "n/a" on unpacker errors Junio C Hamano (3): git blame: document that it always follows origin across whole-file renames Start preparing for 1.7.12.3 Git 1.7.12.3 Linus Torvalds (1): mailinfo: don't require "text" mime type for attachments Orgad Shaneh (1): commit: pay attention to submodule.$name.ignore in .gitmodules Peter Krefting (1): l10n: Fix to Swedish translation Ralf Thielow (1): clone --single: limit the fetch refspec to fetched branch Ramkumar Ramachandra (1): submodule: if $command was not matched, don't parse other args Shawn O. Pearce (2): Revert "retry request without query when info/refs?query fails" Enable info/refs gzip decompression in HTTP client Version v1.7.12.2; changes since v1.7.12.1: ------------------------------------------- Dan Johnson (1): fetch --all: pass --tags/--no-tags through to each remote David Gould (1): run-command.c: fix broken list iteration in clear_child_for_cleanup Felipe Contreras (1): completion: fix shell expansion of items Jeff King (4): argv-array: add pop function argv-array: fix bogus cast when freeing array fetch: use argv_array instead of hand-building arrays Revert "completion: fix shell expansion of items" Jens Lehmann (1): submodule: use argv_array instead of hand-building arrays Jeremy White (1): Documentation: describe subject more precisely Jonathan "Duke" Leto (1): Improve the description of GIT_PS1_SHOWUPSTREAM Junio C Hamano (11): mailinfo: strip "RE: " prefix blame $path: avoid getting fooled by case insensitive filesystems blame: allow "blame file" in the middle of a conflicted merge grep: teach --debug option to dump the parse tree log --grep/--author: honor --all-match honored for multiple --grep patterns log: document use of multiple commit limiting options grep.c: mark private file-scope symbols as static mailinfo: do not concatenate charset= attribute values from mime headers grep.c: make two symbols really file-scope static this time Start preparation for 1.7.12.2 Git 1.7.12.2 Michael J Gruber (6): grep: show --debug output only once t7810-grep: bring log --grep tests in common form t7810-grep: test multiple --grep with and without --all-match t7810-grep: test multiple --author with --all-match t7810-grep: test interaction of multiple --grep and --author options t7810-grep: test --all-match with multiple --grep and --author options Nguyễn Thái Ngọc Duy (3): remote: prefer subcommand name 'remove' to 'rm' doc: move rev-list option - from git-log.txt to rev-list-options.txt Revert diffstat back to English Ralf Thielow (1): l10n: de.po: correct translation of a 'rebase' message Stefan Naewe (1): ls-remote: document the '--get-url' option Stephen Boyd (1): Documentation: Document signature showing options Thynson (2): l10n: Unify the translation for '(un)expected' l10n: Improve many translation for zh_CN Version v1.7.12.1; changes since v1.7.12: ----------------------------------------- Adam Butcher (1): Fix '\ No newline...' annotation in rewrite diffs Adam Spiers (1): Add missing -z to git check-attr usage text for consistency with man page Andreas Schwab (1): Documentation/git-filter-branch: Move note about effect of removing commits Brandon Casey (2): t/t5400: demonstrate breakage caused by informational message from prune prune.c: only print informational message in show_only or verbose mode David Aguilar (2): gitk: Teach "Reread references" to reload tags gitk: Rename 'tagcontents' to 'cached_tagcontent' Eric S. Raymond (4): fast-import: document the --done option contrib/ciabot: Get ciabot configuration from git variables Improved documentation for the ciabot scripts. Make the ciabot scripts completely self-configuring in the normal case. Felipe Contreras (1): gitk: Avoid Meta1-F5 Heiko Voigt (2): Let submodule command exit with error status if path does not exist Documentation/CodingGuidelines: spell out more shell guidelines Jay Soffian (1): gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO Jeff King (29): diff: do not use null sha1 as a sentinel value do not write null sha1s to on-disk index fsck: detect null sha1 in tree entries include agent identifier in capability string docs: monospace listings in docbook output check-docs: mention gitweb specially check-docs: update non-command documentation list command-list: add git-sh-i18n command-list: mention git-credential-* helpers check-docs: factor out command-list check-docs: list git-gui as a command check-docs: drop git-help special-case check-docs: get documented command list from Makefile send-pack: fix capability-sending logic do not send client agent unless server does first parse_feature_request: make it easier to see feature values fetch-pack: mention server version with verbose output config: warn on inaccessible files gitignore: report access errors of exclude files attr: warn on inaccessible attribute files t5550: put auth-required repo in auth/dumb t5550: factor out http auth setup t/lib-httpd: only route auth/dumb to dumb repos t/lib-httpd: recognize */smart/* repos as smart-http t: test basic smart-http authentication t: test http access to "half-auth" repositories http: factor out http error code handling http: prompt for credentials on failed POST log: fix --quiet synonym for -s Joachim Schmitz (2): http.c: don't use curl_easy_strerror prior to curl-7.12.0 sha1_file.c: introduce get_max_fd_limit() helper Junio C Hamano (34): test: rename $satisfied to $satisfied_prereq test: allow prerequisite to be evaluated lazily config: "git config baa" should exit with status 1 t7406: fix misleading "rev-parse --max-count=1 HEAD" sane_execvp(): ignore non-directory on $PATH Documentation: do not mention .git/refs/* directories receive-pack: do not leak output from auto-gc to standard output sh-setup: protect from exported IFS fetch-pack: do not ask for unadvertised capabilities send-email: validate & reconfirm interactive responses rev-list docs: clarify --topo-order description gitcli: describe abbreviation of long options Documentation: update the introductory section git-config doc: unconfuse an example precompose-utf8: do not call checks for non-ascii "utf8" warn_on_inaccessible(): a helper to warn on inaccessible paths specifying ranges: we did not mean to make ".." an empty set mergetool: style fixes Prepare for 1.7.11.6 apply: compute patch->def_name correctly under -p0 doc: "git checkout -b/-B/--orphan" always takes a branch name split_ident_line(): make best effort when parsing author/committer line Document file-glob for "git checkout -- '*.c'" gitcli: formatting fix gitcli: contrast wildcard given to shell and to git Almost 1.7.11.6 Start preparing for 1.7.12.1 Git 1.7.11.6 Further merging down for 1.7.12.1 Further merging in preparation for 1.7.12.1 attr: failure to open a .gitattributes file is OK with ENOTDIR Git 1.7.11.7 Draft release notes to 1.7.12.1 Git 1.7.12.1 Kacper Kornet (2): t6300: test sort with multiple keys for-each-ref: Fix sort with multiple keys Martin von Zweigbergk (4): add tests for 'git rebase --keep-empty' teach log --no-walk=unsorted, which avoids sorting demonstrate broken 'git cherry-pick three one two' cherry-pick/revert: respect order of revisions to pick Matthieu Moy (1): setup: clarify error messages for file/revisions ambiguity Michael Haggerty (1): git-config.txt: fix example Michael J Gruber (6): test-lib: provide case insensitivity as a prerequisite t0050: use the CASE_INSENSITIVE_FS test prereq t0050: use the SYMLINKS test prereq test-lib: provide UTF8 behaviour as a prerequisite rebase -i: use full onto sha1 in reflog t3910: use the UTF8_NFD_TO_NFC test prereq Michał Kiedrowicz (1): tests: Introduce test_seq Miklos Vajna (1): man: git pull -r is a short for --rebase Mischa POSLAWSKY (1): git-jump: ignore (custom) prefix in diff mode Nguyễn Thái Ngọc Duy (1): read_index_from: remove bogus errno assignments Paul Gortmaker (1): apply: delete unused deflate_origlen from patch struct Phil Hord (2): test: git-stash conflict sets up rerere stash: invoke rerere in case of conflict Philip Oakley (1): Doc: Improve shallow depth wording Ramkumar Ramachandra (1): t/perf: add "trash directory" to .gitignore Ramsay Allan Jones (1): test-regex: Add a test to check for a bug in the regex routines Robin Rosenberg (1): cleanup precompose_utf8 Stefan Zager (1): Make 'git submodule update --force' always check out submodules. Stephen Boyd (1): send-email: initial_to and initial_reply_to are both optional Thomas Rast (3): send-email: improve RFC2047 quote parsing diff_setup_done(): return void merge-recursive: eliminate flush_buffer() in favor of write_in_full() Wesley J. Landaker (1): Documentation: indent-with-non-tab uses "equivalent tabs" not 8 Yacine Belkadi (1): completion: add --no-edit to git-commit Version v1.7.12; changes since v1.7.12-rc3: ------------------------------------------- Junio C Hamano (2): Documentation: update URL for formatted pages Git 1.7.12 Peter Krefting (1): l10n: Fixes to Swedish translation Version v1.7.12-rc3; changes since v1.7.12-rc2: ----------------------------------------------- Ben Walton (1): Enable HAVE_DEV_TTY for Solaris Jeff King (1): terminal: seek when switching between reading and writing Jiang Xin (2): l10n: Update one message in git.pot l10n: zh_CN.po: update one translation Junio C Hamano (2): Git 1.7.11.5 Git 1.7.12-rc3 Matthieu Moy (1): Documentation: list git-credential in plumbing commands Peter Baumann (1): git svn: reset invalidates the memoized mergeinfo caches Peter Krefting (1): l10n: Update Swedish translation (1168t0f0u) Ralf Thielow (1): l10n: de.po: translate 77 new messages Robert Luberda (1): git svn: handle errors and concurrent commits in dcommit Tran Ngoc Quan (1): l10n: vi.po: update one message Version v1.7.12-rc2; changes since v1.7.12-rc1: ----------------------------------------------- Jiang Xin (11): i18n: New keywords for xgettext extraction from sh i18n: rebase: mark messages for translation i18n: Rewrite gettext messages start with dash rebase: remove obsolete and unused LONG_USAGE which breaks xgettext i18n: am: mark more strings for translation Remove dead code which contains bad gettext block i18n: merge-recursive: mark strings for translation l10n: Update git.pot (4 new, 3 removed messages) l10n: zh_CN.po: translate 4 new messages l10n: Update git.pot (76 new, 4 removed messages) l10n: zh_CN.po: translate 76 new messages Johannes Sixt (1): Makefile: use overridable $(FIND) instead of hard-coded 'find' Junio C Hamano (3): Prepare for 1.7.11.5 Drop 1.7.11.x items from 1.7.12 release notes Git 1.7.12-rc2 Matthieu Moy (1): git-remote-mediawiki: replace TODO-list in comment by appropriate link Nguyễn Thái Ngọc Duy (1): i18n: leave \n out of translated diffstat Ralf Thielow (3): l10n: de.po: translate 4 new messages git-rebase.sh: fix typo in an error message merge-recursive: separate message for common ancestors Tran Ngoc Quan (2): l10n: vi.po: translate 4 new messages l10n: vi.po update to follow POT in 3b613 Štěpán Němec (1): doc: A few minor copy edits. Version v1.7.12-rc1; changes since v1.7.12-rc0: ----------------------------------------------- Chris Webb (1): rebase -i: handle fixup of root commit correctly Daniel Graña (2): git-submodule: work with GIT_DIR/GIT_WORK_TREE t7409: make sure submodule is initialized and updated in more detail Florian Achleitner (1): Add explanatory comment for transport-helpers refs mapping. Heiko Voigt (1): link_alt_odb_entry: fix read over array bounds reported by valgrind Jeff King (16): advice: pass varargs to strbuf_vaddf, not strbuf_addf commit: check committer identity more strictly commit: document the temporary commit message file test-lib.sh: unset XDG_CONFIG_HOME attr: make sure we have an xdg path before using it t1306: check that XDG_CONFIG_HOME works t/lib-httpd: handle running under --valgrind help.c::uniq: plug a leak checkout: don't confuse ref and object flags t7502: clean up fake_editor tests t7502: properly quote GIT_EDITOR t7502: narrow checks for author/committer name in template t7502: drop confusing test_might_fail call t7502: handle systems where auto-identity is broken t7502: test early quit from commit with bad ident t: add missing executable bit to t7409 Junio C Hamano (9): test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier mergetool: support --tool-help option like difftool does Update draft release notes to 1.7.12 Enumerate revision range specifiers in the documentation help.c::exclude_cmds(): plug a leak perl: detect new files in MakeMaker builds Update draft release notes to 1.7.12 Git 1.7.11.4 Git 1.7.12-rc1 Matthieu Moy (1): ignore: make sure we have an xdg path before using it Max Horn (1): Make documentation more consistent. Michael G. Schwern (14): Quiet warning if Makefile.PL is run with -w and no --localedir Don't lose Error.pm if $@ gets clobbered. The Makefile.PL will now find .pm files itself. Extract some utilities from git-svn to allow extracting Git::SVN. Prepare Git::SVN for extraction into its own file. Extract Git::SVN from git-svn into its own .pm file. Move initialization of Git::SVN variables into Git::SVN. Prepare Git::SVN::Log for extraction from git-svn. Extract Git::SVN::Log from git-svn. Prepare Git::SVN::Migration for extraction from git-svn. Extract Git::SVN::Migration from git-svn. Load all the modules in one place and before running code. Move Git::IndexInfo into its own file. Extract Git::SVN::GlobSpec from git-svn. Ramsay Allan Jones (2): t1100-*.sh: Fix an intermittent test failure t7810-*.sh: Remove redundant test Version v1.7.12-rc0; changes since v1.7.11.7: --------------------------------------------- Alexander Strasser (7): t4012: modernize style for quoting t4012: Unquote git command fragment in test title t4012: Actually quote the sed script t4012: Break up pipe into serial redirections t4012: Make --shortstat test more robust t4012: Re-indent test snippets t4012: Use test_must_fail instead of if-else Andreas Schwab (1): Fix formatting in git-config(1) Chris Webb (4): rebase -i: support --root without --onto Add tests for rebase -i --root without --onto Add config variable to set HTML path for git-help --web Allow help.htmlpath to be a URL prefix David Barr (7): vcs-svn: drop no-op reset methods vcs-svn: avoid self-assignment in dummy initialization of pre_off vcs-svn: simplify cleanup in apply_one_window vcs-svn: use constcmp instead of prefixcmp vcs-svn: use strstr instead of memmem vcs-svn: suppress signed/unsigned comparison warnings vcs-svn: suppress a signed/unsigned comparison warning Felipe Contreras (2): completion: remove executable mode completion: split __git_ps1 into a separate script Gary Gibbons (2): git p4: refactor diffOpts calculation git p4: add support for 'p4 move' in P4Submit Guillaume Sasdy (4): git-remote-mediawiki: scripts to install, delete and clear a MediaWiki git-remote-mediawiki: test environment of git-remote-mediawiki git-remote-mediawiki (t9360): test git-remote-mediawiki clone git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push Heiko Voigt (1): remove the impression of unexpectedness when access is denied Huynh Khoi Nguyen Nguyen (4): config: read (but not write) from $XDG_CONFIG_HOME/git/config file Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes config: write to $XDG_CONFIG_HOME/git/config file when appropriate Javier Roucher Iglesias (1): add 'git credential' plumbing command Jeff King (26): docs: drop asciidoc7compatible flag docs: drop antique comment from Makefile docs/clone: mention that --local may be ignored clone: allow --no-local to turn off local optimizations move git_version_string into version.c version: add git_user_agent function http: get default user-agent from git_user_agent t1304: improve setfacl prerequisite setup Makefile: sort LIB_H list Makefile: fold MISC_H into LIB_H Makefile: do not have git.o depend on common-cmds.h Makefile: apply dependencies consistently to sparse/asm targets Makefile: do not replace @@GIT_USER_AGENT@@ in scripts Makefile: split GIT_USER_AGENT from GIT-CFLAGS Makefile: split prefix flags from GIT-CFLAGS Makefile: do not replace @@GIT_VERSION@@ in shell scripts Makefile: update scripts when build-time parameters change Makefile: build instaweb similar to other scripts Makefile: move GIT-VERSION-FILE dependencies closer to use index-pack: loop while inflating objects in unpack_data revision: avoid work after --max-count is reached status: color in-progress message like other header messages docs/credential: minor clarity fixups mw-to-git: check blank credential attributes via length credential: convert "url" attribute into its parsed subparts mw-to-git: use git-credential's URL parser Jiang Xin (2): l10n: Update git.pot (29 new messages) l10n: zh_CN.po: translate 29 new messages Johannes Sixt (3): t7400: avoid path mangling issues perl/Makefile: Fix a missing double-quote t4012: use 'printf' instead of 'dd' to generate a binary file Jon Seymour (4): submodule: additional regression tests for relative URLs submodule: document failure to handle relative superproject origin URLs submodule: fix sync handling of some relative superproject origin URLs submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar Jonathan Nieder (8): vcs-svn: allow import of > 4GiB files vcs-svn: suppress -Wtype-limits warning perl/Makefile: move "mkdir -p" to module installation loop for maintainability vcs-svn: suppress a signed/unsigned comparison warning vcs-svn: allow 64-bit Prop-Content-Length Makefile: fold XDIFF_H and VCSSVN_H into LIB_H Makefile: be silent when only GIT_USER_AGENT changes Makefile: document ground rules for target-specific dependencies Junio C Hamano (58): completion: warn people about duplicated function sha1_name.c: indentation fix Kick off post 1.7.11 cycle The first batch for 1.7.12 Second batch for 1.7.12 Third batch for 1.7.12 sha1_name.c: hide get_sha1_with_context_1() ugliness sha1_name.c: get rid of get_sha1_with_mode_1() sha1_name.c: get rid of get_sha1_with_mode() sha1_name.c: clarify what "fake" is for in find_short_object_filename() sha1_name.c: rename "now" to "current" sha1_name.c: refactor find_short_packed_object() sha1_name.c: correct misnamed "canonical" and "res" sha1_name.c: restructure disambiguation of short names get_sha1(): fix error status regression sha1_name.c: allow get_short_sha1() to take other flags sha1_name.c: teach get_short_sha1() a commit-only option Fourth batch for 1.7.12 Fifth batch for 1.7.12 apply: fix an incomplete comment in check_patch() apply: a bit more comments on PATH_TO_BE_DELETED apply: clear_image() clears things a bit more apply: refactor read_file_or_gitlink() apply: factor out checkout_target() helper function apply: split load_preimage() helper function out apply: refactor "previous patch" logic apply: further split load_preimage() apply: move check_to_create_blob() closer to its sole caller apply: move "already exists" logic to check_to_create() apply: accept -3/--3way command line option apply: fall back on three-way merge apply: plug the three-way merge logic in apply: move verify_index_match() higher apply: --3way with add/add conflict apply: register conflicted stages to the index apply: allow rerere() to work on --3way results apply: document --3way option sha1_name.c: get_describe_name() by definition groks only commits sha1_name.c: get_sha1_1() takes lookup flags sha1_name.c: many short names can only be committish sha1_name.c: teach lookup context to get_sha1_with_context() sha1_name.c: introduce get_sha1_committish() revision.c: allow handle_revision_arg() to take other flags revision.c: the "log" family, except for "show", takes committish sha1_name.c: add support for disambiguating other types apply: --build-fake-ancestor expects blobs commit-tree: the command wants a tree and commits reset: the command takes committish rev-parse: A and B in "rev-parse A..B" refer to committish rev-parse --disambiguate= apply: tests for the --3way option Reduce draft release notes to 1.7.12 t1512: ignore whitespaces in wc -l output t1512: match the "other" object names Sixth batch for 1.7.12 Update draft release notes for 7th batch Update draft release notes to 1.7.12 Git 1.7.12-rc0 Lucien Kong (5): rebase -i: teach "--exec " wt-status.*: better advices for git status added t7512-status-help.sh: better advices for git status status: don't suggest "git rm" or "git add" if not appropriate status: better advices when splitting a commit (during rebase -i) Marcin Owsiany (1): git-svn: don't create master if another head exists Martin von Zweigbergk (4): rebase: don't source git-sh-setup twice rebase --root: print usage on too many args am --rebasing: get patch body from commit, not from mailbox am: don't call mailinfo if $rebasing Matthieu Moy (24): git credential fill: output the whole 'struct credential' git-remote-mediawiki: add credential support git-remote-mediawiki: don't compute the diff when getting commit message git-remote-mediawiki: don't "use encoding 'utf8';" git-remote-mediawiki: split get_mw_pages into smaller functions git-remote-mediawiki: improve support for non-English Wikis git-remote-mediawiki: support for uploading file in test environment git-remote-mediawiki: change return type of get_mw_pages git-remote-mediawiki: refactor loop over revision ids git-remote-mediawiki: extract revision-importing loop to a function git-remote-mediawiki: more efficient 'pull' in the best case git-remote-mediawiki: be more defensive when requests fail git-remote-mediawiki: update comments to reflect credential support config: fix several access(NULL) calls git-remote-mediawiki: don't split namespaces with spaces git-remote-mediawiki: actually send empty comment when they're empty git-remote-mediawiki: make mediafiles export optional git-remote-mediawiki: get rid of O(N^2) loop git-remote-mediawiki: use --force when adding notes git-remote-mediawiki: show progress information when listing pages git-remote-mediawiki: show progress information when getting last remote revision git-remote-mediawiki: properly deal with invalid remote revisions git-remote-mediawiki: fix incorrect test usage in test git-remote-mediawiki: allow page names with a ':' Michael J Gruber (1): t3404: make test 57 work with dash and others NGUYEN Kim Thuat (2): git-remote-mediawiki: send "File:" attachments to a remote wiki git-remote-mediawiki (t9363): test 'File:' import and export Namhyung Kim (3): gitweb: Cleanup git_print_log() gitweb: Handle other types of tag in git_print_log gitweb: Add support to Link: tag Nguyễn Thái Ngọc Duy (12): index-pack: hash non-delta objects while reading from stream index-pack: use streaming interface on large blobs (most of the time) index-pack: factor out unpack core from get_data_from_pack index-pack: use streaming interface for collision test on large blobs pack-objects: use streaming interface for reading large loose blobs Unindent excluded_from_list() dir.c: get rid of the wildcard symbol set in no_wildcard() exclude: do strcmp as much as possible before fnmatch Remove i18n legos in notifying new branch tracking setup reflog: remove i18n legos in pruning message notes-merge: remove i18n legos in merge result message rerere: remove i18n legos in result message Pat Thoyts (1): Restore use of 'help.format' configuration property in 'git help' Pavel Volek (1): git-remote-mediawiki: import "File:" attachments Pete Wyckoff (13): git p4 test: wait longer for p4d to start and test its pid git p4 test: use real_path to resolve p4 client symlinks git p4 test: simplify quoting involving TRASH_DIRECTORY git p4 test: never create default test repo git p4 test: rename some "git-p4 command" strings git p4 test: check for error message in failed test git p4 test: copy source indeterminate git p4 test: cleanup_git should make a new $git git p4 test: split up big t9800 test git p4 test: fix badp4dir test git p4: remove unused P4Submit interactive setting git p4 test: refactor marshal_dump git p4: notice Jobs lines in git commit messages Peter Krefting (1): Update Swedish translation (1095t0f0u) Ralf Thielow (1): l10n: de.po: translate 29 new messages Ramsay Allan Jones (1): vcs-svn: rename check_overflow and its arguments for clarity SZEDER Gábor (3): tests: move code to run tests under bash into a helper library tests: add tests for the bash prompt functions in the completion script completion: respect $GIT_DIR Simon Cathebras (1): git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters Stefano Lattarini (7): autoconf: GIT_CONF_APPEND_LINE: change signature autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST autoconf: remove some redundant shell indirections autoconf: remove few redundant semicolons autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append' build: "make clean" should not remove configure-generated files build: reconfigure automatically if configure.ac changes Thomas Gummerer (2): Replace strlen() with ce_namelen() Strip namelen out of ce_flags into a ce_namelen field Tim Henigan (1): difftool: only copy back files modified during directory diff Torsten Bögershausen (1): git on Mac OS and precomposed unicode Tran Ngoc Quan (1): l10n: Update translation for Vietnamese Vincent van Ravesteijn (1): help: use HTML as the default help format on Windows Štěpán Němec (1): doc: A few minor copy edits. Version v1.7.11.7; changes since v1.7.11.6: ------------------------------------------- David Aguilar (2): gitk: Teach "Reread references" to reload tags gitk: Rename 'tagcontents' to 'cached_tagcontent' Felipe Contreras (1): gitk: Avoid Meta1-F5 Jeff King (9): t5550: put auth-required repo in auth/dumb t5550: factor out http auth setup t/lib-httpd: only route auth/dumb to dumb repos t/lib-httpd: recognize */smart/* repos as smart-http t: test basic smart-http authentication t: test http access to "half-auth" repositories http: factor out http error code handling http: prompt for credentials on failed POST log: fix --quiet synonym for -s Junio C Hamano (8): specifying ranges: we did not mean to make ".." an empty set apply: compute patch->def_name correctly under -p0 doc: "git checkout -b/-B/--orphan" always takes a branch name split_ident_line(): make best effort when parsing author/committer line Document file-glob for "git checkout -- '*.c'" gitcli: formatting fix gitcli: contrast wildcard given to shell and to git Git 1.7.11.7 Kacper Kornet (2): t6300: test sort with multiple keys for-each-ref: Fix sort with multiple keys Ramsay Allan Jones (1): test-regex: Add a test to check for a bug in the regex routines Version v1.7.11.6; changes since v1.7.11.5: ------------------------------------------- Adam Butcher (1): Fix '\ No newline...' annotation in rewrite diffs Ben Walton (1): Enable HAVE_DEV_TTY for Solaris Brandon Casey (1): t/t5400: demonstrate breakage caused by informational message from prune Eric S. Raymond (3): contrib/ciabot: Get ciabot configuration from git variables Improved documentation for the ciabot scripts. Make the ciabot scripts completely self-configuring in the normal case. Heiko Voigt (2): Let submodule command exit with error status if path does not exist Documentation/CodingGuidelines: spell out more shell guidelines Jay Soffian (1): gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO Jeff King (6): commit: check committer identity more strictly diff: do not use null sha1 as a sentinel value do not write null sha1s to on-disk index fsck: detect null sha1 in tree entries terminal: seek when switching between reading and writing docs: monospace listings in docbook output Junio C Hamano (13): config: "git config baa" should exit with status 1 t7406: fix misleading "rev-parse --max-count=1 HEAD" sane_execvp(): ignore non-directory on $PATH Documentation: do not mention .git/refs/* directories receive-pack: do not leak output from auto-gc to standard output sh-setup: protect from exported IFS rev-list docs: clarify --topo-order description gitcli: describe abbreviation of long options git-config doc: unconfuse an example mergetool: style fixes Prepare for 1.7.11.6 Almost 1.7.11.6 Git 1.7.11.6 Luka Perkov (1): builtin.h: remove unused cmd_ declarations Martin von Zweigbergk (1): add tests for 'git rebase --keep-empty' Matthieu Moy (1): setup: clarify error messages for file/revisions ambiguity Michael Haggerty (1): git-config.txt: fix example Michael J Gruber (1): rebase -i: use full onto sha1 in reflog Michał Kiedrowicz (1): tests: Introduce test_seq Miklos Vajna (1): man: git pull -r is a short for --rebase Nguyễn Thái Ngọc Duy (1): read_index_from: remove bogus errno assignments Paul Gortmaker (1): apply: delete unused deflate_origlen from patch struct Phil Hord (2): test: git-stash conflict sets up rerere stash: invoke rerere in case of conflict Stefan Zager (1): Make 'git submodule update --force' always check out submodules. Thomas Rast (3): send-email: improve RFC2047 quote parsing diff_setup_done(): return void merge-recursive: eliminate flush_buffer() in favor of write_in_full() Version v1.7.11.5; changes since v1.7.11.4: ------------------------------------------- Heiko Voigt (1): link_alt_odb_entry: fix read over array bounds reported by valgrind Jeff King (1): checkout: don't confuse ref and object flags Jonathan Nieder (4): block-sha1: avoid pointer conversion that violates alignment constraints block-sha1: put expanded macro parameters in parentheses Makefile: fix location of listing produced by "make subdir/foo.s" Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads Junio C Hamano (4): mergetool: support --tool-help option like difftool does Enumerate revision range specifiers in the documentation Prepare for 1.7.11.5 Git 1.7.11.5 Lawrence Mitchell (2): git-blame.el: Use with-current-buffer where appropriate git-blame.el: Do not use bare 0 to mean (point-min) Max Horn (1): Make documentation more consistent. Michael Schubert (1): Documentation/git-daemon: add missing word Ramkumar Ramachandra (1): commit: document a couple of options Ramsay Allan Jones (1): t7810-*.sh: Remove redundant test René Scharfe (1): git: Wrong parsing of ssh urls with IPv6 literals ignores port Rüdiger Sonderfeld (2): git-blame.el: use mapc instead of mapcar git-blame.el: Do not use goto-line in lisp code Štěpán Němec (1): doc: A few minor copy edits. Version v1.7.11.4; changes since v1.7.11.3: ------------------------------------------- Jeff King (3): diff: test precedence of external diff drivers advice: pass varargs to strbuf_vaddf, not strbuf_addf commit: document the temporary commit message file Jens Lehmann (1): submodules: don't stumble over symbolic links when cloning recursively Junio C Hamano (7): filter-branch: do not forget the '@' prefix to force git-timestamp date.c: Fix off by one error in object-header date parsing t7003: add test to filter a branch with a commit at epoch commit-tree: resurrect command line parsing updates Revert "git-commit-tree(1): update synopsis" diff: correctly disable external_diff with --no-ext-diff Git 1.7.11.4 Paul Gortmaker (1): am: indicate where a failed patch is to be found Version v1.7.11.3; changes since v1.7.11.2: ------------------------------------------- Alex Riesen (1): Restore umasks influence on the permissions of work tree created by clone Chris Webb (2): git-checkout: disallow --detach on unborn branch Allow edit of empty message with commit --amend Jay Soffian (1): fast-export: quote paths with spaces Jeff King (3): push: don't guess at qualifying remote refs on deletion add: create ADD_EDIT.patch with mode 0666 commit: fix "--amend --only" with no pathspec Junio C Hamano (10): show: fix "range implies walking" t/test-lib.sh: export PERL_PATH for use in scripts tests: enclose $PERL_PATH in double quotes t/README: add a bit more Don'ts diff-index.c: do not pretend paths are pathspecs diff-index.c: unify handling of command line paths diff-index.c: "git diff" has no need to read blob from the standard input rerere: make rr-cache fanout directory honor umask cache_name_compare(): do not truncate while comparing paths Git 1.7.11.3 Martin von Zweigbergk (1): add test case for rebase of empty commit Thomas Rast (1): Demonstrate git-show is broken with ranges Vincent van Ravesteijn (1): t: Replace 'perl' by $PERL_PATH Version v1.7.11.2; changes since v1.7.11.1: ------------------------------------------- Carlos Martín Nieto (2): Documentation: --no-walk is no-op if range is specified git-cherry-pick.txt: clarify the use of revision range notation Heiko Voigt (1): update-index: allow overwriting existing submodule index entries Jeff King (3): fix pager.diff with diff --no-index do not run pager with diff --no-index --quiet diff: handle relative paths in no-index Junio C Hamano (15): request-pull: really favor a matching tag ls-files -i: pay attention to exclusion of leading paths ls-files -i: micro-optimize path_excluded() tweak "bundle verify" of a complete history path_excluded(): update API to less cache-entry centric builtin/add.c: use path_excluded() unpack-trees.c: use path_excluded() in check_ok_to_remove() dir.c: make excluded() file scope static revision: "simplify" options imply topo-order sort revision: note the lack of free() in simplify_merges() archive: ustar header checksum is computed unsigned revision: ignore side parents while running simplify-merges index-pack: Disable threading on cygwin blame: compute abbreviation width that ensures uniqueness Git 1.7.11.2 Leila Muhtasib (1): Documentation: Fix misspellings Matthieu Moy (2): sha1_name: do not trigger detailed diagnosis for file arguments verify_filename(): ask the caller to chose the kind of diagnosis Michał Górny (1): git-submodule.sh: fix filename in comment. Nguyễn Thái Ngọc Duy (1): clone: fix ref selection in --single-branch --branch=xxx Peter Krefting (1): Update Swedish translation (1066t0f0u) Thomas Badie (1): git-add--interactive.perl: Remove two unused variables Tim Henigan (1): diff-no-index: exit(1) if 'diff --quiet ' finds changes Version v1.7.11.1; changes since v1.7.11: ----------------------------------------- Jeff King (1): docs: always define git-relative-html-prefix attribute Junio C Hamano (2): git-commit-tree(1): update synopsis Git 1.7.11.1 Miklos Vajna (1): Documentation: spelling fixes Version v1.7.11; changes since v1.7.11-rc3: ------------------------------------------- Alexander Strasser (1): diff: Only count lines in show_shortstats Jonathan Nieder (2): perl/Makefile.PL: warn about duplicate module list in perl/Makefile perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too Junio C Hamano (2): Git 1.7.10.5 Git 1.7.11 Marco Paolone (1): l10n: it.po: translate 212 new messages Ramsay Allan Jones (1): gitweb: Skip 'modification times' tests when no date parser available SZEDER Gábor (2): completion: put main git and gitk completion functions back into git namespace completion: remove credential helpers from porcelain commands Vincent van Ravesteijn (1): Do not autosquash in case of an implied interactive rebase Version v1.7.11-rc3; changes since v1.7.11-rc2: ----------------------------------------------- Jeff King (1): docs: fix cross-directory linkgit references Jiang Xin (2): l10n: Update git.pot (27 new, 1 removed messages) l10n: zh_CN.po: translate 27 new messages Johannes Schindelin (1): fast-export: report SHA-1 instead of gibberish when marks exist already Jonathan Nieder (3): git-svn: make Git::SVN::Editor a separate file git-svn: make Git::SVN::RA a separate file git-svn: use YAML format for mergeinfo cache when possible Junio C Hamano (2): fmt-merge-msg: make attribution into comment lines Git 1.7.11-rc3 Matthieu Moy (1): api-credential.txt: document that helpers field is filled-in automatically Ralf Thielow (1): l10n: de.po: translate 27 new messages Tran Ngoc Quan (1): l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb Version v1.7.11-rc2; changes since v1.7.11-rc1: ----------------------------------------------- Colby Ranger (1): Add persistent-https to contrib Jiang Xin (2): l10n: Update git.pot (5 new, 3 removed messages) l10n: zh_CN.po: translate 2 new, 3 fuzzy messages Junio C Hamano (3): git-svn: platform auth providers are working only on 1.6.15 or newer doc: fix xref link from api docs to manual pages Git 1.7.11-rc2 Matthieu Moy (3): api-credentials.txt: show the big picture first api-credentials.txt: mention credential.helper explicitly api-credentials.txt: add "see also" section Ralf Thielow (4): l10n: de.po: translate 265 new messages l10n: de.po: translate 41 new messages l10n: de.po: translate 2 new, 3 fuzzy messages l10n: de.po: add additional newline Ramkumar Ramachandra (1): t3510 (cherry-pick-sequence): add missing '&&' Tran Ngoc Quan (1): l10n: Update translation for Vietnamese Version v1.7.11-rc1; changes since v1.7.11-rc0: ----------------------------------------------- Erik Faye-Lund (2): rebase: report invalid commit correctly Makefile: add missing GIT-VERSION-FILE dependency Jeff King (30): ident: split setup_ident into separate functions http-push: do not access git_default_email directly fmt-merge-msg: don't use static buffer in record_person move identity config parsing to ident.c move git_default_* variables to ident.c ident: trim trailing newline from /etc/mailname format-patch: use default email for generating message ids fmt_ident: drop IDENT_WARN_ON_NO_NAME code ident: don't write fallback username into git_default_name drop length limitations on gecos-derived names and emails ident: report passwd errors with a more friendly message ident: use full dns names to generate email addresses ident: use a dynamic strbuf in fmt_ident ident: trim whitespace from default name/email format-patch: refactor get_patch_filename fetch-pack: sort incoming heads fetch-pack: avoid quadratic behavior in remove_duplicates add sorting infrastructure for list refs fetch-pack: sort the list of incoming refs fetch-pack: avoid quadratic loop in filter_refs fetch-pack: sort incoming heads list earlier ident: reword empty ident error message ident: refactor NO_DATE flag in fmt_ident ident: let callers omit name with fmt_indent format-patch: use GIT_COMMITTER_EMAIL in message ids ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT ident: reject bogus email addresses with IDENT_STRICT format-patch: do not use bogus email addresses in message ids t5701: modernize style INSTALL: update asciidoc recommendation Jens Lehmann (1): submodules: print "registered for path" message only once Jiang Xin (5): l10n: Update git.pot (41 new messages) l10n: zh.CN.po: update by msgmerge git.pot l10n: zh_CN.po: translate 323 new messages l10n: Set nplurals of zh_CN.po from 1 to 2 i18n: apply: split to fix a partial i18n message Jonathan Nieder (3): git-svn: move Git::SVN::Prompt into its own file git-svn: rename SVN::Git::* packages to Git::SVN::* git-svn: make Git::SVN::Fetcher a separate file Junio C Hamano (6): refs: do not create ref_entry when searching cherry-pick: regression fix for empty commits Start preparing for 1.7.10.4 Update draft release notes to 1.7.11 Git 1.7.10.4 Git 1.7.11-rc1 Marco Paolone (1): l10n: New it.po file with 504 translations Matthieu Moy (1): Reduce cost of deletion in levenstein distance (4 -> 3) Michael Haggerty (5): free_ref_entry(): do not trigger reading of loose refs cmd_fetch_pack(): declare dest to be const cmd_fetch_pack(): handle non-option arguments outside of the loop cmd_fetch_pack(): combine the loop termination conditions cmd_fetch_pack(): respect constness of argv parameter Nguyễn Thái Ngọc Duy (2): pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .." pack-objects: refactor write_object() into helper functions Peter Krefting (1): Update Swedish translation (728t0f0u) René Scharfe (3): refs: convert parameter of search_ref_dir() to length-limited string refs: convert parameter of create_dir_entry() to length-limited string refs: use strings directly in find_containing_dir() Tran Ngoc Quan (2): Init translation for Vietnamese First release translation for Vietnamese Vincent van Ravesteijn (1): Do not autosquash in case of an implied interactive rebase Vitor Antunes (3): git-p4: Test changelists touching two branches git-p4: Verify detection of "empty" branch creation git-p4: Clean up branch test cases Version v1.7.11-rc0; changes since v1.7.10.5: --------------------------------------------- Amiel Martin (2): fixed order of assertion in tests sort assertion to make it more generic Arlen Cuss (1): Fix refspecs in given example for git subtree pull. Avery Pennarun (72): basic options parsing and whatnot. 'git subtree split' now basically works. We now copy the other stuff about a commit (changelog, author, etc). Print out the newly created commitid at the end, for use in other scripts. Add a new --rejoin option. Use information about prior splits to make sure merges work right. Added a --onto option, but it's so complicated I can't tell if it works. Hmm... can't actually filter rev-list on the subdir name. Skip over empty commits. Quick test script for generating reasonably complex merge scenarios. Prune out some extra merge commits by comparing their parents correctly. Even more aggressive commit trimming. Okay, that was a little too aggressive. Pass the path using the --prefix option instead of on the command line. Add a new 'git subtree add' command for adding subtrees from a given rev. Add 'git subtree merge' and 'git subtree pull'. Handle it successfully if a given parent commit has no parents. Change test.sh to test the new add, merge, and pull commands. todo list Add --annotate option, and create recognizable file content during tests. Typo when searching for existing splits. Clarify why we can't do 'git rev-list' with a path. Add a 'create' helper function in test.sh. Add some basic assertions to test.sh. test.sh tweak Trim some extra merge commits that don't need to go into the split tree. Only copy a commit if it has at least one nonidentical parent. test.sh: make sure no commit changes more than one file at a time. Simplify merges even more aggressively. test.sh: oops, never intended to count the raw number of commits. debug messages are off by default; use -d to enable. Abort if --rejoin fails. More to-do items based on feedback typo in comment New --branch option to split command. slightly rearrange help message for split. FIXME help for --squash option merge_msg() is really more like rejoin_msg(). Basic "subtree merge --squash" support. Don't squash-merge if the old and new commits are the same. Fix splitting after using a squash merge. Make --squash work with the 'add' command too. Add basic git-subtree manpage in asciidoc format. man page: add an EXAMPLES section. update todo Some todo items reported by pmccurdy todo Docs: when pushing to github, the repo path needs to end in .git todo todo^ todo todo: idea for a 'git subtree grafts' command Improve patch to use git --exec-path: add to PATH instead. Fix behaviour if you have a branch named the same as your --prefix Add a README that says to email me instead of using github mail. If someone provides a --prefix that ends with slash, strip the slash. Fix a minor problem in identifying squashes vs. normal splits. cmd_pull didn't support --squash correctly. Add some tips for how to install. Oops, forgot a COPYING file. It's GPLv2. Weird, I forgot to have 'make test' call test.sh. Jakub's changes broke the progress message slightly. Make tests pass with recent git (1.7.0 and up). Improve checking for existence of the --prefix directory. Oops. Apparently I didn't run 'make test' after most recent change. Some recent tests accidentally depended on very new versions of git. (Hopefully) fix PATH setting for msysgit. Another fix for PATH and msysgit. Fix typo: an -> a Fix a few typos/grammar-o's in the preceding commit. It's also okay if an expected tree object is actually a commit. Skip commit objects that should be trees, rather than copying them. Avishay Lavie (1): git-svn: support rebase --preserve-merges Ben Walton (3): add installation support to Makefile make git version dynamic when building documentation Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd Bryan Larsen (1): docs: simplify example 1 Clemens Buchacher (2): merge overwrites unstaged changes in renamed file t5570: use explicit push refspec Cole Stanfield (1): Fixing eval syntax error. Dan Sabath (2): docs: add simple 'add' case to clarify setup. Docs: cleaning up example textual redundancy David A. Greene (11): Move Tests Into Subdirectory Rename Test Use Test Harness Set TEST_DIRECTORY Remove unnecessary git-subtree files Use project config files Use configure settings for git-subtree Install git-subtree from contrib Add subtree test Makefile Use git-subtree test Makefile Fix git-subtree install instructions David Aguilar (1): t7800: Test difftool passing arguments to diff Felipe Contreras (8): tests: add initial bash completion tests completion: simplify __gitcomp_1 completion: simplify by using $prev completion: add missing general options completion: simplify __git_complete_revlist_file completion: add new __git_complete helper completion: rename internal helpers _git and _gitk completion: add support for backwards compatibility Heiko Voigt (3): Teach revision walking machinery to walk multiple times sequencially Refactor submodule push check to use string list instead of integer push: teach --recurse-submodules the on-demand option Jakub Narębski (1): gitweb: Pass esc_html_hl_regions() options to esc_html() Jakub Suder (9): added -p alias for --prefix added -m/--message option for setting merge commit message allow using --branch with existing branches if it makes sense fix for subtree split not finding proper base for new commits changed alias for --prefix from -p to -P fixed bug in commit message for split added tests for recent changes added temporary test dirs to gitignore improved rev_is_descendant_of_branch() function Jared Hance (1): apply: do not leak patches and fragments Jeff King (4): checkout: suppress tracking message with "-q" teach "git branch" a --quiet option doc/config: fix inline literals status: refactor colopts handling Jesse Greenwald (2): Split cmd now processes commits in topo order. Added check to order of processed commits. Jiang Xin (4): l10n: Update git.pot (33 new, 24 deleted messages) l10n: Update Simplified Chinese translation l10n: Update git.pot (275 new, 15 removed messages) l10n: Update git.pot (8 new, 4 removed messages) Johannes Berg (1): am: support --include option Johannes Sixt (3): Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows t4006: Windows do not have /dev/zero Fix t3411.3 to actually rebase something John Yani (1): docs: Description, synopsys, options and examples changes. Jon Seymour (2): git-svn: clarify the referent of dcommit's optional argument rev-parse doc: --git-dir does not always show a relative path Jonathan Nieder (15): test: use test_i18ncmp when checking --stat output test: use numstat instead of diffstat in funny-names test test: modernize funny-names test style test: test cherry-pick functionality and output separately test: use --numstat instead of --stat in "git stash show" tests test: use numstat instead of diffstat in binary-diff test diffstat summary line varies by locale: miscellany var doc: default editor and pager are configurable at build time var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings test: do not rely on US English tracking-info messages test: use test_i18ncmp for "Patch format detection failed" message test: am of empty patch should not succeed fast-import doc: cat-blob and ls responses need to be consumed quickly completion: avoid trailing space for --exec-path i18n: mark relative dates for translation Junio C Hamano (45): streaming: make streaming-write-entry to be more reusable fmt-merge-msg: show those involved in a merged series apply: rename free_patch() to free_patch_list() apply: free patch->{def,old,new}_name fields apply: release memory for fn_table apply: free patch->result am -3: list the paths that needed 3-way fallback apply: free unused fragments for submodule patch varint: make it available outside the context of pack cache.h: hide on-disk index details read-cache.c: allow unaligned mapping of the index file read-cache.c: make create_from_disk() report number of bytes it consumed read-cache.c: report the header version we do not understand read-cache.c: move code to copy ondisk to incore cache to a helper function read-cache.c: move code to copy incore to ondisk cache to a helper function read-cache.c: read prefix-compressed names in index on-disk version v4 read-cache.c: write prefix-compressed names in the index update-index: upgrade/downgrade on-disk index version Kick off post 1.7.10 cycle apply: drop unused macro apply: tighten constness of line buffer apply: document buffer ownership rules across functions RelNotes: the first batch of topics graduated to 'master' RelNotes: the second batch of topics graduated to 'master' mergesort: rename it to llist_mergesort() RelNotes: the third batch RelNotes: the fourth batch of topics graduated to 'master' The fifth batch of topics graduated to 'master' push.default doc: explain simple after upstream Update draft release notes to 1.7.11 The sixth batch of topics graduated to 'master' unpack-trees: preserve the index file version of original index-v4: document the entry format The seventh batch of topics graduated to 'master' git-svn: introduce SVN version comparison function The eighth batch of topics graduated to 'master' refs: fix find_containing_dir() regression Makefile: NO_INSTALL_HARDLINKS The ninth batch of topics graduated to 'master' The tenth batch of topics Update draft release notes to 1.7.11 (11th batch) Update draft release notes for 12th batch git-sh-setup: define workaround wrappers before they are used Update draft release notes to 1.7.11 Git 1.7.11-rc0 Kacper Kornet (3): gitweb: Don't set owner if got empty value from projects.list gitweb: Option to omit column with time of the last change gitweb: Option to not display information about owner Luke Diamand (10): git p4: Fixing script editor checks git p4: import/export of labels to/from p4 git p4: fix-up "import/export of labels to/from p4" git p4: Squash P4EDITOR in test harness git p4: Ignore P4EDITOR if it is empty git p4: move verbose to base class git p4: fix unit tests git p4: add test for tag import/export enabled via config git p4: fix bug when verbose enabled with tag export git p4: fix bug when enabling tag import/export via config variables Marco Sousa (1): l10n: pt_PT.po translate new messages Matthieu Moy (5): Documentation: explain push.default option a bit more Undocument deprecated alias 'push.default=tracking' t5528-push-default.sh: add helper functions push: introduce new push.default mode "simple" push: document the future default change for push.default (matching -> simple) Matthijs Kooijman (1): git-svn: use platform specific auth providers Michael Haggerty (32): refs.c: reorder definitions more logically refs: manage current_ref within do_one_ref() do_for_each_ref_in_array(): new function do_for_each_ref_in_arrays(): new function repack_without_ref(): reimplement using do_for_each_ref_in_array() names_conflict(): simplify implementation free_ref_entry(): new function check_refname_component(): return 0 for zero-length components struct ref_entry: nest the value part in a union refs.c: rename ref_array -> ref_dir sort_ref_dir(): simplify logic refs: store references hierarchically do_for_each_ref(): only iterate over the subtree that was requested get_ref_dir(): return early if directory cannot be read get_ref_dir(): use a strbuf to hold refname get_ref_dir(): rename "base" parameter to "dirname" get_ref_dir(): require that the dirname argument ends in '/' refs.c: extract function search_for_subdir() get_ref_dir(): take the containing directory as argument do_for_each_reflog(): return early on error do_for_each_reflog(): use a strbuf to hold logfile name bisect: copy filename string obtained from git_path() find_containing_dir(): use strbuf in implementation of this function refs: wrap top-level ref_dirs in ref_entries read_loose_refs(): rename function from get_ref_dir() get_ref_dir(): add function for getting a ref_dir from a ref_entry search_for_subdir(): return (ref_dir *) instead of (ref_entry *) struct ref_dir: store a reference to the enclosing ref_cache read_loose_refs(): eliminate ref_cache argument refs: read loose references lazily t/Makefile: retain cache t/.prove across prove runs Avoid sorting if references are added to ref_cache in order Michael Schubert (1): remote: update builtin usage Michał Kiedrowicz (7): gitweb: Use descriptive names in esc_html_hl_regions() gitweb: esc_html_hl_regions(): Don't create empty elements gitweb: Extract print_sidebyside_diff_lines() gitweb: Use print_diff_chunk() for both side-by-side and inline diffs gitweb: Push formatting diff lines to print_diff_chunk() gitweb: Highlight interesting parts of diff gitweb: Refinement highlightning in combined diffs Neil Horman (5): git-cherry-pick: add allow-empty option git-cherry-pick: Add keep-redundant-commits option git-cherry-pick: Add test to validate new options git-rebase: add keep_empty flag git cherry-pick: do not dereference a potential NULL pointer Nguyễn Thái Ngọc Duy (37): Add more large blob test cases cat-file: use streaming API to print blobs parse_object: avoid putting whole blob in core show: use streaming API for showing blobs fsck: use streaming API for writing lost-found blobs update-server-info: respect core.bigfilethreshold Makefile: feed all header files to xgettext strbuf: convenience format functions with \n automatically appended i18n: help: mark strings for translation i18n: make warn_dangling_symref() automatically append \n i18n: remote: mark strings for translation i18n: apply: mark strings for translation i18n: apply: update say_patch_name to give translators complete sentence i18n: index-pack: mark strings for translation i18n: bundle: mark strings for translation help: replace underlining "help -a" headers using hyphens with a blank line Add column layout skeleton and git-column Stop starting pager recursively column: add columnar layout column: add dense layout support help: reuse print_columns() for help -a branch: add --column status: add --column column: support piping stdout to external git-column process tag: add --column archive-tar: turn write_tar_entry into blob-writing only archive-tar: unindent write_tar_entry by one level archive: delegate blob reading to backend archive-tar: stream large blobs to tar file branch: remove lego in i18n tracking info strings Makefile: keep many variable list sorted index-pack: restructure pack processing into three main functions index-pack: support multithreaded delta resolving index-pack: disable threading if NO_PREAD is defined apply: remove lego in i18n string in gitdiff_verify_name i18n: parseopt: lookup help and argument translations when showing usage i18n: apply: mark parseopt strings for translation Pelle Wessman (3): Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously. Use 'git merge -Xsubtree' when git version >= 1.7.0. Fixed regression with splitting out new subtree Pete Wyckoff (9): git-p4: move to toplevel git p4: update name in script git p4: use "git p4" directly in tests remove superfluous newlines in error messages remove blank filename in error message git p4: bring back files in deleted client directory git p4: test submit git p4: fix writable file after rename or copy git p4: submit files with wildcards Ralf Thielow (2): l10n: Update German translation remote: fix typo Ramsay Allan Jones (5): compat/win32/pthread.h: Add an pthread_key_delete() implementation compat/mingw.h: Set S_ISUID to prevent a fast-import test failure git-submodule.sh: Don't use $path variable in eval_gettext string git-sh-setup.sh: Add an pwd() function for MinGW builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning René Scharfe (26): add mergesort() for linked lists commit: use mergesort() in commit_list_sort_by_date() revision: insert unsorted, then sort in prepare_revision_walk() sequencer: export commit_list_append() revision: append to list instead of insert and reverse commit: remove commit_list_reverse() streaming: void pointer instead of char pointer archive-zip: remove uncompressed_size archive-zip: factor out helpers for writing sizes and CRC archive-zip: streaming for stored files archive-zip: streaming for deflated files t5000: rationalize unzip tests dir: convert to strbuf xdiff: add hunk_func() blame: use hunk_func(), part 1 blame: use hunk_func(), part 2 blame: factor out helper for calling xdi_diff() xdiff: remove emit_func() and xdi_diff_hunks() xdiff: remove unused functions dir: respect string length argument of read_directory_recursive() dir: simplify fill_directory() archive: simplify refname handling archive-tar: keep const in checksum calculation xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines xdiff: import new 32-bit version of count_masked_bytes() Roman Kagan (3): git-svn: use POSIX::sigprocmask to block signals git-svn: ignore SIGPIPE git-svn: drop redundant blocking of SIGPIPE SZEDER Gábor (2): tests: add tests for the __gitcomp() completion helper function completion: fix completion after 'git --option ' Sebastian Pipping (1): gitweb: Fix unintended "--no-merges" for regular Atom feed Stefano Lattarini (3): configure: move definitions of private m4 macros before AC_INIT invocation configure: avoid some code repetitions thanks to m4_{push,pop}def configure: be more idiomatic Thomas Rast (2): xdiff: load full words in the inner loop of xdl_hash_record xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE Tim Henigan (8): difftool: parse options using Getopt::Long difftool: add '--no-gui' option difftool: exit(0) when usage is printed difftool: remove explicit change of PATH difftool: stop appending '.exe' to git difftool: eliminate setup_environment function difftool: teach difftool to handle directory diffs difftool: print list of valid tools with '--tool-help' W. Trevor King (3): gitweb: add `status` headers to git_feed() responses. gitweb: refactor If-Modified-Since handling gitweb: add If-Modified-Since handling to git_snapshot(). Wayne Walter (1): Added new 'push' command and 2-parameter form of 'add'. Win Treese (2): git-subtree.txt: add another example. Make sure that exists when splitting. Zbigniew Jędrzejewski-Szmek (13): t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER t0303: resurrect commit message as test documentation t1507: add tests to document @{upstream} behaviour Provide branch name in error message when using @{u} Provide better message for barnhc_wiht_tpyo@{u} Be more specific if upstream branch is not tracked i18n: mark @{upstream} error messages for translation t9002: work around shells that are unable to set COLUMNS to 1 diff --stat: use less columns for change counts test: modernize style of t4006 tests: check --[short]stat output after chmod diff --stat: report mode-only changes for binary files like text files diff --stat: do not run diff on indentical files kTln2 (1): Add explicit path of git installation by 'git --exec-path'. Ævar Arnfjörð Bjarmason (3): git-branch: remove lego in i18n messages git-commit: remove lego in i18n messages git-commit: remove lego in i18n messages Version v1.7.10.5; changes since v1.7.10.4: ------------------------------------------- Johannes Schindelin (1): fast-export: report SHA-1 instead of gibberish when marks exist already Junio C Hamano (1): Git 1.7.10.5 Vincent van Ravesteijn (1): Do not autosquash in case of an implied interactive rebase Version v1.7.10.4; changes since v1.7.10.3: ------------------------------------------- Avery Pennarun (1): checkout: no progress messages if !isatty(2). Erik Faye-Lund (2): rebase: report invalid commit correctly Makefile: add missing GIT-VERSION-FILE dependency Jeff King (3): fix off-by-one error in split_ident_line pretty: avoid buffer overflow in format_person_part avoid segfault when reading header of malformed commits Junio C Hamano (2): Start preparing for 1.7.10.4 Git 1.7.10.4 Peter Krefting (1): Update Swedish translation (728t0f0u) René Scharfe (4): grep: factor out create_grep_pat() grep: factor out do_append_grep_pat() grep: support newline separated pattern list grep: stop leaking line strings with -f Version v1.7.10.3; changes since v1.7.10.2: ------------------------------------------- Bobby Powers (2): diff --no-index: reset temporary buffer lengths on directory iteration diff --no-index: don't leak buffers in queue_diff Carlos Martín Nieto (1): pack-protocol: fix first-want separator in the examples Erik Faye-Lund (2): clone: fix progress-regression checkout: do not corrupt HEAD on empty repo Heiko Voigt (2): link to gitmodules page at the beginning of git-submodule documentation teach add_submodule_odb() to look for alternates Jan Krüger (1): log-tree: use custom line terminator in line termination mode Jeff King (10): docs: stop using asciidoc no-inline-literal t1411: add more selector index/date tests log: respect date_mode_explicit with --format:%gd reflog-walk: clean up "flag" field of commit_reflog struct reflog-walk: always make HEAD@{0} show indexed selectors commit: refactor option parsing status: refactor null_termination option status: fix null termination with "-b" status: respect "-b" for porcelain format osxkeychain: pull make config from top-level directory Jens Lehmann (1): Consistently use "superproject" instead of "supermodule" Jiang Xin (4): l10n: Update git.pot (1 new messages) l10n: zh_CN.po: translate 1 new message l10n: Update git.pot (3 new, 2 removed messages) l10n: zh_CN.po: translate 3 new messages Johannes Sixt (3): t2020-checkout-detach: check for the number of orphaned commits checkout (detached): truncate list of orphaned commits at the new HEAD t3404: begin "exchange commits with -p" test with correct preconditions Jonathan Nieder (1): config doc: remove confusion about relative GIT_DIR from FILES section Junio C Hamano (5): log-tree: the previous one is still not quite right reflog-walk: tell explicit --date=default from not having --date at all Start preparing for 1.7.10.3 Update draft release notes to 1.7.10.3 Git 1.7.10.3 Linus Torvalds (1): fmt-merge-message: add empty line between tag and signature verification Ralf Thielow (7): l10n: add new members to German translation team l10n: de.po: translate "track" as "beobachten" l10n: de.po: translate "remote" as "extern" l10n: de.po: collection of improvements l10n: de.po: unify translation of "ahead" and "behind" l10n: de.po: translate one new message l10n: de.po: translate 3 new messages Thomas Rast (4): l10n: de.po: translate "bare" as "bloß" l10n: de.po: hopefully uncontroversial fixes l10n: de.po: translate "bad" as "ungültig" ("invalid") l10n: de.po: collection of suggestions Version v1.7.10.2; changes since v1.7.10.1: ------------------------------------------- Angus Hammond (1): grep.c: remove redundant line of code Ben Walton (1): Avoid bug in Solaris xpg4/sed as used in submodule Christian Couder (1): revert: add missing va_end Christopher Tiwald (2): push: Provide situational hints for non-fast-forward errors Fix httpd tests that broke when non-ff push advice changed Clemens Buchacher (3): http auth fails with multiple curl handles properly keep track of current working directory cherry-pick: do not expect file arguments Florian Achleitner (1): Documentation/git-config: describe and clarify "--local " option Heiko Voigt (1): document submdule.$name.update=none option for gitmodules Jeff King (15): clean up struct ref's nonfastforward field http-backend: respect existing GIT_COMMITTER_* variables fix http auth with multiple curl handles gc: do not explode objects which will be immediately pruned http: clean up leak in init_curl_http_auth http: use newer curl options for setting credentials argv-array: refactor empty_argv initialization argv-array: add a new "pushl" method gc: use argv-array for sub-commands config: reject bogus section names for --rename-section config: expand tildes in include.path variable send-pack: show progress when isatty(2) teach send-pack about --[no-]progress t5541: test more combinations of --progress t/gitweb-lib: use $PERL_PATH to run gitweb Jim Meyering (1): diff: avoid stack-buffer-read-overrun for very long name Johannes Sixt (2): t9300-fast-import: avoid 'exit' in test_expect_success snippets t5570: fix forwarding of git-daemon messages via cat Junio C Hamano (13): xdiff: remove XDL_PATCH_* macros xdiff: PATIENCE/HISTOGRAM are not independent option bits rebase -i: remind that the lines are top-to-bottom builtin/merge.c: remove "remoteheads" global variable builtin/merge.c: collect other parents early builtin/merge.c: reduce parents early fmt-merge-msg: discard needless merge parents t9400: fix gnuism in grep diff --no-index: use strbuf for temporary pathnames contrib/rerere-train: use installed git-sh-setup Start preparing for 1.7.10.2 Update draft release notes to 1.7.10.2 Git 1.7.10.2 Lucian Poston (5): Add output_prefix_length to diff_options Adjust stat width calculations to take --graph output into account t4052: Adjust --graph --stat output for prefixes t4052: Test diff-stat output with minimum columns Prevent graph_width of stat width from falling below min Marc Branchaud (2): fetch: Give remote_ref to update_local_ref() as well fetch: describe new refs based on where it came from Michał Kiedrowicz (1): merge tests: octopus with redundant parents Pete Wyckoff (2): git-remote-testgit: fix race when spawning fast-import git p4 doc: fix formatting Ralf Thielow (1): sequencer: remove additional blank line René Scharfe (2): unpack-trees: don't perform any index operation if we're not merging unpack-trees: plug minor memory leak Ross Lagerwall (2): rev-parse --show-prefix: add in trailing newline stash: use eval_gettextln correctly Stefano Lattarini (1): tests: modernise style: more uses of test_line_count Zbigniew Jędrzejewski-Szmek (4): t4052: test --stat output with --graph test-lib: skip test with COLUMNS=1 under mksh t4052: work around shells unable to set COLUMNS to 1 Consistently use perl from /usr/bin/ for scripts Version v1.7.10.1; changes since v1.7.10: ----------------------------------------- Adam Monsen (1): git-commit.txt: clarify -t requires editing message Byrial Jensen (2): l10n: New da.po file with 0 translations l10n: Add Danish team (da) to list of teams Ivan Todoroski (4): fetch-pack: new --stdin option to read refs from stdin remote-curl: send the refs to fetch-pack on stdin fetch-pack: test cases for the new --stdin option remote-curl: main test case for the OS command line overflow Jeff King (6): drop casts from users EMPTY_TREE_SHA1_BIN make is_empty_blob_sha1 available everywhere teach diffcore-rename to optionally ignore empty content merge-recursive: don't detect renames of empty files add--interactive: ignore unmerged entries in patch mode run-command: treat inaccessible directories as ENOENT Jens Lehmann (1): submodules: recursive fetch also checks new tags for submodule commits Jiang Xin (2): l10n: Update git.pot (2 new messages) l10n: Update Simplified Chinese translation Johan Herland (3): t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ notes-merge: use opendir/readdir instead of using read_directory() notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd Johannes Sixt (1): t4034: diff.*.wordregex should not be "sticky" in --word-diff John Keeping (1): rebase -i continue: don't skip commits that only change submodules Jonathan Nieder (1): bundle: remove stray single-quote from error message Junio C Hamano (16): ident.c: add split_ident_line() to parse formatted ident line t7503: does pre-commit-hook learn authorship? commit: pass author/committer info to hooks remove_dir_recursively(): Add flag for skipping removal of toplevel dir clean: preserve nested git worktree in subdirectories t7501: test the right kind of breakage commit: do not trigger bogus "has templated message edited" check commit: rephrase the error when user did not touch templated log message Documentation/git-commit: rephrase the "initial-ness" of templates push: error out when the "upstream" semantics does not make sense blame: accept --need-minimal Git 1.7.7.7 Git 1.7.8.6 Git 1.7.9.7 Start preparing for 1.7.10.1 Git 1.7.10.1 Lucian Poston (3): log --graph --stat: three-dash separator should come after graph lines log --graph: fix break in graph lines t4202: add test for "log --graph --stat -p" separator lines Marco Sousa (1): l10n: Updated pt_PT language Pete Wyckoff (1): fast-import: tighten parsing of datarefs Ralf Thielow (2): l10n: Add the German translation team and initialize de.po l10n: Initial German translation Ramsay Allan Jones (1): compat/mingw.[ch]: Change return type of exec functions to int René Scharfe (3): combine-diff: fix loop index underflow submodule: fix prototype of gitmodules_config test-subprocess: fix segfault without arguments Thomas Rast (2): diff: refactor the word-diff setup from builtin_diff_cmd diff: tweak a _copy_ of diff_options with word-diff Version v1.7.10; changes since v1.7.10-rc4: ------------------------------------------- Felipe Contreras (1): spec: add missing build dependency Junio C Hamano (1): Git 1.7.10 Version v1.7.10-rc4; changes since v1.7.10-rc3: ----------------------------------------------- Heiko Voigt (1): string-list: document that string_list_insert() inserts unique strings Jiang Xin (1): l10n: Improve zh_CN translation for Git 1.7.10-rc3 Junio C Hamano (3): merge: backport GIT_MERGE_AUTOEDIT support Git 1.7.9.6 Git 1.7.10-rc4 Marco Sousa (1): l10n: Inital Portuguese Portugal language (pt_PT) Pat Thoyts (2): gitk: fix tabbed preferences construction when using tcl 8.4 gitk: fix setting font display with new tabbed dialog layout. René Scharfe (1): config: remove useless assignment Vincent van Ravesteijn (1): l10n: Add the Dutch translation team and initialize nl.po Version v1.7.10-rc3; changes since v1.7.10-rc2: ----------------------------------------------- Frédéric Brière (1): gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields Jiang Xin (4): l10n: Update git.pot (1 new message) l10n: Update zh_CN translation for Git 1.7.10-rc1 l10n: Review zh_CN translation for Git 1.7.10-rc1 Add url of Swedish l10n team in TEAMS file Jim Meyering (3): gitk: Make "git describe" output clickable, too correct spelling: an URL -> a URL correct a few doubled-word nits in comments and documentation Jonathan Nieder (1): gitk: Use symbolic font names "sans" and "monospace" when available Junio C Hamano (3): Git 1.7.9.5 Update draft release notes to 1.7.10 Git 1.7.10-rc3 Marcus Karlsson (1): gitk: Teach gitk to respect log.showroot Mark Lodato (1): grep doc: add --break / --heading / -W to synopsis Nelson Benitez Leon (1): documentation: fix alphabetic ordered list for git-rebase man page Pat Thoyts (2): gitk: Use a tabbed dialog to edit preferences gitk: Fix the display of files when filtered by path Paul Mackerras (2): gitk: Speed up resolution of short SHA1 ids gitk: Add menu items for comparing a commit with the marked commit Peter Krefting (1): Update Swedish translation (724t0f0u). Rodrigo Silva (MestreLion) (1): Documentation: improve description of GIT_EDITOR and preference order Zbigniew Jędrzejewski-Szmek (2): gitk: Use "gitk: repo-top-level-dir" as window title tests: unset COLUMNS inherited from environment Version v1.7.10-rc2; changes since v1.7.10-rc1: ----------------------------------------------- Alex Merry (1): contrib/completion: "local var=()" is misinterpreted as func-decl by zsh D Waitzman (1): Documentation/gitweb: trivial English fixes Jonathan Nieder (2): fast-import: leakfix for 'ls' of dirty trees fast-import: don't allow 'ls' of path with empty components Junio C Hamano (4): fetch/receive: remove over-pessimistic connectivity check Update draft release notes to 1.7.10 .mailmap: unify various old mail addresses of gitster Git 1.7.10-rc2 Stefano Lattarini (1): configure: allow user to prevent $PATH "sanitization" on Solaris Tim Henigan (7): Documentation/diff-options: reword description of --submodule option contrib/diffall: comment actual reason for 'cdup' contrib/diffall: create tmp dirs without mktemp contrib/diffall: eliminate use of tar contrib/diffall: eliminate duplicate while loops contrib/diffall: fix cleanup trap on Windows Documentation/difftool: add deltawalker to list of valid diff tools Ævar Arnfjörð Bjarmason (2): Git::I18N: compatibility with perl <5.8.3 perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER Version v1.7.10-rc1; changes since v1.7.10-rc0: ----------------------------------------------- Alex Zepeda (1): verify-tag: Parse GPG configuration options. Jakub Narębski (1): gitweb: Fix fixed string (non-regexp) project search Jens Lehmann (3): submodules: always use a relative path to gitdir submodules: always use a relative path from gitdir to work tree submodules: refactor computation of relative gitdir path Jiang Xin (3): l10n: Update zh_CN translation for 1.7.9.2 l10n: Update git.pot (1 new message) l10n: Update zh_CN translation for 1.7.10-rc0 Johannes Sixt (1): submodules: fix ambiguous absolute paths under Windows Junio C Hamano (7): Update draft release notes to 1.7.10 t0204: clarify the "observe undefined behaviour" test i18n: fix auto detection of gettext scheme for shell scripts Git 1.7.9.4 Update draft release notes to 1.7.10 before -rc1 am: officially deprecate -b/--binary option Git 1.7.10-rc1 Karsten Blees (1): fix deletion of .git/objects sub-directories in git-prune/repack Martin Stenberg (1): config: report errors at the EOL with correct line number Peter Krefting (2): po/sv.po: add Swedish translation Update Swedish translation (732t0f0u). Phil Hord (1): rerere: Document 'rerere remaining' Thomas Rast (4): perf: load test-lib-functions from the correct directory perf: export some important test-lib variables p4000: use -3000 when promising -3000 git-am: error out when seeing -b/--binary Thynson (7): l10n: Improve zh_CN translation for lines insertion and deletion. l10n: Improve zh_CN translation for msg about branch deletion deny l10n: Improve zh_CN translation for empty cherry-pick msg. l10n: Improve zh_CN translation for msg that make empty commit when amend. l10n: Improve commit msg for zh_CN translation l10n: Improve zh_CN trans for msg that cannot fast-forward l10n: Improve zh_CN translation for msg "not something we can merge" Vincent van Ravesteijn (3): Documentation/git-branch: cleanups Documentation/git-branch: fix a typo Documentation/git-branch: add default for --contains Version v1.7.10-rc0; changes since v1.7.9.7: -------------------------------------------- Adrian Weimann (1): completion: --edit and --no-edit for git-merge Alex Riesen (1): add a Makefile switch to avoid gettext translation in shell scripts Bernhard R. Link (6): gitweb: move hard coded .git suffix out of git_get_projects_list gitweb: prepare git_get_projects_list for use outside 'forks'. gitweb: add project_filter to limit project list to a subdirectory gitweb: limit links to alternate forms of project_list to active project_filter gitweb: show active project_filter in project_list page header gitweb: place links to parent directories in page header Carlos Martín Nieto (1): Make git-{pull,rebase} message without tracking information friendlier Clemens Buchacher (3): git-daemon: add tests git-daemon: produce output when ready git-daemon tests: wait until daemon is ready David Barr (9): vcs-svn: set up channel to read fast-import cat-blob response vcs-svn: quote paths correctly for ls command vcs-svn: use mark from previous import for parent commit vcs-svn: pass paths through to fast-import vcs-svn: drop string_pool vcs-svn: drop treap vcs-svn: drop obj_pool vcs-svn: avoid using ls command twice vcs-svn: implement text-delta handling Dmitry Ivankov (2): vcs-svn: do not initialize report_buffer twice vcs-svn: reset first_commit_done in fast_export_init Felipe Contreras (4): remote: use a local variable in match_push_refs() remote: reorganize check_pattern_match() remote: refactor code into alloc_delete_ref() push: add '--prune' option Frédéric Heitzmann (1): completion: add --interactive option to git svn dcommit Jakub Narębski (11): gitweb: improve usability of projects search form gitweb: Make project search respect project_filter gitweb: Harden and improve $project_filter page title gitweb: Refactor checking if part of project info need filling gitweb: Option for filling only specified info in fill_project_list_info gitweb: Faster project search gitweb: Introduce esc_html_match_hl and esc_html_hl_regions gitweb: Highlight matched part of project name when searching projects gitweb: Highlight matched part of project description when searching projects gitweb: Highlight matched part of shortened project description gitweb: Fix passing parameters to git_project_search_form Jan Krüger (1): symbolic-ref --short: abbreviate the output unambiguously Jared Hance (1): Add threaded versions of functions in symlinks.c. Jeff King (20): parse_object: try internal cache before reading object db upload-pack: avoid parsing objects during ref advertisement upload-pack: avoid parsing tag destinations t0300: use write_script helper docs: add a basic description of the config API drop odd return value semantics from userdiff_config diff-highlight: make perl strict and warnings fatal diff-highlight: don't highlight whole lines diff-highlight: refactor to prepare for multi-line hunks diff-highlight: match multi-line hunks diff-highlight: document some non-optimal cases docs/api-config: minor clarifications t1300: add missing &&-chaining config: copy the return value of prefix_filename config: teach git_config_set_multivar_in_file a default path config: teach git_config_rename_section a file argument config: provide a version of git_config with more options config: stop using config_exclusive_filename config: eliminate config_exclusive_filename config: add include directive Jehan Bing (1): Add a setting to require a filter to be successful Jens Lehmann (1): test-lib: add the test_pause convenience function Jiang Xin (5): l10n: initial git.pot for 1.7.10 upcoming release l10n: po for zh_CN l10n: Update git.pot (12 new messages) l10n: update Chinese translation to the new git.po Update l10n guide: change the repository URL, etc Jonathan Nieder (23): vcs-svn: use higher mark numbers for blobs vcs-svn: save marks for imported commits vcs-svn: add a comment before each commit vcs-svn: eliminate repo_tree structure vcs-svn: handle filenames with dq correctly Makefile: list one vcs-svn/xdiff object or header per line vcs-svn: learn to maintain a sliding view of a file vcs-svn: make buffer_read_binary API more convenient vcs-svn: skeleton of an svn delta parser vcs-svn: parse svndiff0 window header vcs-svn: read the preimage when applying deltas vcs-svn: read inline data from deltas vcs-svn: read instructions from deltas vcs-svn: implement copyfrom_data delta instruction vcs-svn: verify that deltas consume all inline data vcs-svn: let deltas use data from postimage vcs-svn: let deltas use data from preimage test-svn-fe: split off "test-svn-fe -d" into a separate function vcs-svn: cap number of bytes read from sliding view vcs-svn: guard against overflow when computing preimage length vcs-svn: avoid hangs from corrupt deltas vcs-svn: allow import of > 4GiB files vcs-svn: suppress a -Wtype-limits warning Junio C Hamano (28): git-sh-i18n: restructure the logic to compute gettext.sh scheme i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n merge: use editor by default in interactive sessions push: do not let configured foreign-vcs permanently clobbered t9801: do not overuse test_must_fail i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT vcs-svn/svndiff.c: squelch false "unused" warning from gcc Kick off the post 1.7.9 cycle Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 t9100: remove bogus " || test" after each test scriptlet merge: do not trust fstat(2) too much when checking interactiveness Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 grep: use static trans-case table fsck: --no-dangling omits "dangling object" information pickaxe: allow -i to search in patch case-insensitively Update l10n guide diff --stat: tests for long filenames and big change counts Update draft release notes to 1.7.10 Update draft release notes to 1.7.10 fsck doc: a minor typofix Git 1.7.10-rc0 Linus Torvalds (1): "git pull" doesn't know "--edit" Luke Diamand (6): git-p4: handle p4 branches and labels containing shell chars git-p4: cope with labels with empty descriptions git-p4: importing labels should cope with missing owner git-p4: add test for p4 labels git-p4: label import fails with multiple labels at the same changelist git-p4: add initial support for RCS keywords Michael Haggerty (11): pack_refs(): remove redundant check ref_array: keep track of whether references are sorted add_packed_ref(): new function in the refs API. write_remote_refs(): create packed (rather than extra) refs t5700: document a failure of alternates to affect fetch clone.c: move more code into the "if (refs)" conditional fetch-pack.c: rename some parameters from "path" to "refname" fetch-pack.c: inline insert_alternate_refs() everything_local(): mark alternate refs as complete clone: do not add alternate references to extra_refs refs: remove the extra_refs API Michał Kiedrowicz (2): pack-objects: Fix compilation with NO_PTHREDS grep -P: add tests for matching ^ and $ Nelson Benitez Leon (1): http: support proxies that require authentication Nguyễn Thái Ngọc Duy (20): clone: add --single-branch to fetch only one branch Fix incorrect ref namespace check Eliminate recursion in setting/clearing marks in commit list index-pack: eliminate recursion in find_unresolved_deltas index-pack: eliminate unlimited recursion in get_base_data() t5601: add missing && cascade clone: write detached HEAD in bare repositories clone: factor out checkout code clone: factor out HEAD update code clone: factor out remote ref writing clone: delay cloning until after remote HEAD checking clone: --branch= always means refs/heads/ clone: refuse to clone if --branch points to bogus ref clone: allow --branch to take a tag clone: print advice on checking out detached HEAD clone: fix up delay cloning conditions pack-objects: do not accept "--index-version=version," pack-objects: remove bogus comment pack-objects: convert to use parse_options() cache-tree: update API to take abitrary flags Pete Wyckoff (6): git-p4: only a single ... wildcard is supported git-p4: fix verbose comment typo git-p4: clarify comment git-p4: adjust test to adhere to stricter useClientSpec git-p4: add tests demonstrating spec overlay ambiguities git-p4: Change p4 command invocation Phil Hord (1): cherry-pick: No advice to commit if --no-commit Philip Jägenstedt (2): completion: remote set-* and completion: normalize increment/decrement style Ramkumar Ramachandra (2): revert: prepare to move replay_action to header sequencer: factor code out of revert builtin Ramsay Allan Jones (3): vcs-svn: rename check_overflow arguments for clarity builtin/tag.c: Fix a sparse warning ctype.c: Fix a sparse warning René Scharfe (5): xdiff: print post-image for common records instead of pre-image test-parse-options: convert to OPT_BOOL() parse-options: allow positivation of options starting, with no- parse-options: remove PARSE_OPT_NEGHELP parse-options: typo check for unknown switches Riku (1): l10n: update zh_CN translation for "Fetching %s" Russell Myers (1): git-p4: the option to specify 'host' is -H, not -h Stefano Lattarini (1): t0000: modernise style Steven Walter (2): git-svn.perl: perform deletions before anything else git-svn.perl: fix a false-positive in the "already exists" test Thomas Rast (6): am: learn passing -b to mailinfo mailinfo: with -b, keep space after [foo] Move the user-facing test library to test-lib-functions.sh Introduce a performance testing framework Add a performance test for git-grep perf: compare diff algorithms Tim Henigan (2): contrib: add git-diffall script mergetools: add a plug-in to support DeltaWalker Tom Grennan (1): tag: add --points-at list option Vitor Antunes (2): git-p4: Search for parent commit on branch creation git-p4: Add test case for complex branch import Wei-Yin Chen (陳威尹) (1): git-svn: Fix time zone in --localtime Yichao Yu (1): l10n: fast-forward here is ff-only merge, not push Zbigniew Jędrzejewski-Szmek (11): make lineno_width() from blame reusable for others send-email: document the --smtp-debug option git-p4: missing she-bang line in t9804 confuses prove diff --stat: use the full terminal width show --stat: use the full terminal width log --stat: use the full terminal width merge --stat: use the full terminal width diff --stat: use a maximum of 5/8 for the filename part diff --stat: add a test for output with COLUMNS=40 diff --stat: enable limiting of the graph part diff --stat: add config option to limit graph width ws3389 (1): l10n: leave leading space unchanged for zh_CN.po Ævar Arnfjörð Bjarmason (2): git-svn: remove redundant porcelain option to rev-list git-svn: un-break "git svn rebase" when log.abbrevCommit=true Version v1.7.9.7; changes since v1.7.9.6: ----------------------------------------- D Waitzman (1): Documentation/gitweb: trivial English fixes Jonathan Nieder (1): bundle: remove stray single-quote from error message Junio C Hamano (4): fetch/receive: remove over-pessimistic connectivity check Git 1.7.7.7 Git 1.7.8.6 Git 1.7.9.7 Version v1.7.9.6; changes since v1.7.9.5: ----------------------------------------- Heiko Voigt (1): string-list: document that string_list_insert() inserts unique strings Junio C Hamano (2): merge: backport GIT_MERGE_AUTOEDIT support Git 1.7.9.6 Version v1.7.9.5; changes since v1.7.9.4: ----------------------------------------- Jakub Narębski (1): gitweb: Fix actionless dispatch for non-existent objects Jonathan Nieder (2): fast-import: leakfix for 'ls' of dirty trees fast-import: don't allow 'ls' of path with empty components Junio C Hamano (2): i18n of multi-line advice messages Git 1.7.9.5 Kirill Smelkov (1): t/Makefile: Use $(sort ...) explicitly where needed Mark Lodato (1): grep doc: add --break / --heading / -W to synopsis Martin Stenberg (1): config: report errors at the EOL with correct line number Nelson Benitez Leon (1): documentation: fix alphabetic ordered list for git-rebase man page Phil Hord (1): rerere: Document 'rerere remaining' Rodrigo Silva (MestreLion) (1): Documentation: improve description of GIT_EDITOR and preference order Version v1.7.9.4; changes since v1.7.9.3: ----------------------------------------- Jakub Narębski (1): gitweb: Fix fixed string (non-regexp) project search Junio C Hamano (6): am -3: allow nonstandard -p option test: "am -3" can accept non-standard -p t4011: modernise style t4011: illustrate "diff-index -p" on stat-dirty paths diff -p: squelch "diff --git" header for stat-dirty paths Git 1.7.9.4 Thomas Rast (5): t5510: refactor bundle->pack conversion t5510: ensure we stay in the toplevel test dir bundle: keep around names passed to add_pending_object() Document the --histogram diff option t5704: fix nonportable sed/grep usages Version v1.7.9.3; changes since v1.7.9.2: ----------------------------------------- Andrew Wong (1): rebase -m: only call "notes copy" when rewritten exists and is non-empty Carlos Martín Nieto (2): branch: don't assume the merge filter ref exists Documentation: use {asterisk} in rev-list-options.txt when needed Clemens Buchacher (1): http.proxy: also mention https_proxy and all_proxy Dmitry V. Levin (1): Makefile: add thread-utils.h to LIB_H Jakub Narębski (2): gitweb: Fix "heads" view when there is no current branch gitweb: Handle invalid regexp in regexp search Jeff King (4): disconnect from remote helpers more gently teach convert_to_git a "dry run" mode teach dry-run convert_to_git not to require a src buffer do not stream large files to pack when filters are in use Jehan Bing (1): Ignore SIGPIPE when running a filter driver Jim Meyering (1): am: don't infloop for an empty input file John Szakmeister (1): configure: don't use -lintl when there is no gettext support Jonathan Nieder (1): mergetools/meld: Use --help output to detect --output support Junio C Hamano (9): refresh_index: do not show unmerged path that is outside pathspec Documentation/merge-options.txt: group "ff" related options together Document merge.branchdesc configuration variable Git 1.7.8.5 Document accumulated fixes since 1.7.9.2 Update draft release notes to 1.7.9.3 Documentation: do not assume that n > 1 in ~$n Update draft release notes to 1.7.9.3 for the last time Git 1.7.9.3 Libor Pechacek (1): Documentation fixes in git-config Matthieu Moy (1): README: point to Documentation/SubmittingPatches Michael Haggerty (2): post-receive-email: remove unused variable post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly Michael J Gruber (1): t0300: work around bug in dash 0.5.6 Michał Kiedrowicz (1): grep -P: Fix matching ^ and $ Nguyễn Thái Ngọc Duy (2): rev-list: remove BISECT_SHOW_TRIED flag rev-list: fix --verify-objects --quiet becoming --objects Pete Wyckoff (4): git-p4: set useClientSpec variable on initial clone git-p4: fix submit regression with clientSpec and subdir clone git-p4: remove bash-ism in t9809 git-p4: remove bash-ism in t9800 Philip Jägenstedt (1): remote: fix set-branches usage and documentation Stefano Lattarini (1): tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh Thomas Rast (6): merge: add instructions to the commit message when editing bundle: put strbuf_readline_fd in strbuf.c with adjustments bundle: use a strbuf to scan the log for boundary commits strbuf: improve strbuf_get*line documentation t5704: match tests to modern style fast-import: zero all of 'struct tag' to silence valgrind Tim Henigan (2): CodingGuidelines: Add a note about spaces after redirection CodingGuidelines: do not use 'which' in shell scripts Tom Grennan (1): t5512 (ls-remote): modernize style Version v1.7.9.2; changes since v1.7.9.1: ----------------------------------------- Christian Hammerl (1): completion: Allow dash as the first character for __git_ps1 Clemens Buchacher (4): git rev-list: fix invalid typecast push/fetch/clone --no-progress suppresses progress output t5541: check error message against the real port number used do not override receive-pack errors Felipe Contreras (3): completion: work around zsh option propagation bug completion: use ls -1 instead of rolling a loop to do that ourselves completion: simplify __gitcomp and __gitcomp_nl implementations Jakub Narębski (2): gitweb: Allow UTF-8 encoded CGI query parameters and path_info gitweb: Fix 'grep' search for multiple matches in file Jeff King (12): grep: make locking flag global grep: move sha1-reading mutex into low-level code grep: refactor the concept of "grep source" into an object convert git-grep to use grep_source interface grep: drop grep_buffer's "name" parameter grep: cache userdiff_driver in grep_source grep: respect diff attributes for binary-ness grep: load file data after checking binary-ness grep: pre-load userdiff drivers when threaded standardize and improve lookup rules for external local repos prompt: clean up strbuf usage prompt: fall back to terminal if askpass fails Jiang Xin (2): i18n: git-commit whence_s "merge/cherry-pick" message i18n: format_tracking_info "Your branch is behind" message Johannes Sixt (1): Makefile: fix syntax for older make Junio C Hamano (8): mailmap: always return a plain mail address from map_user() git checkout -b: allow switching out of an unborn branch commit: ignore intent-to-add entries instead of refusing diff --stat: show bars of same length for paths with same amount of changes Update draft release notes to 1.7.9.2 Update draft release notes to 1.7.9.2 Update draft release notes to 1.7.9.2 Git 1.7.9.2 Matthieu Moy (1): fsck: give accurate error message on empty loose object files Namhyung Kim (2): ctype.c only wants git-compat-util.h ctype: implement islower/isupper macro Nguyễn Thái Ngọc Duy (3): sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry() find_pack_entry(): do not keep packed_git pointer locally Use correct grammar in diffstat summary line Philip Jägenstedt (2): completion: remove stale "to submit patches" documentation completion: use tabs for indentation Ralf Thielow (2): completion: --edit-description option for git-branch completion: --list option for git-branch Theodore Ts'o (1): Fix build problems related to profile-directed optimization Zbigniew Jędrzejewski-Szmek (2): pager: find out the terminal width before spawning the pager man: rearrange git synopsis to fit in 80 lines Дилян Палаузов (1): Makefile: introduce CHARSET_LIB to link with -lcharset Version v1.7.9.1; changes since v1.7.9: --------------------------------------- Adrian Weimann (1): completion: --edit and --no-edit for git-merge Albert Yale (1): grep: fix -l/-L interaction with decoration lines Ben Walton (1): Drop system includes from inet_pton/inet_ntop compatibility wrappers Clemens Buchacher (2): fix push --quiet: add 'quiet' capability to receive-pack dashed externals: kill children on exit David Aguilar (1): mergetool: Provide an empty file when needed Jakub Narębski (1): git.spec: Workaround localized messages not put in any RPM Jeff King (4): run-command: optionally kill children on exit imap-send: remove dead code tag: fix output of "tag -n" when errors occur tag: die when listing missing or corrupt objects Jens Lehmann (1): submodule add: fix breakage when re-adding a deep submodule Johannes Schindelin (1): add -e: do not show difference in a submodule that is merely dirty Junio C Hamano (15): server_supports(): parse feature list more carefully Making pathspec limited log play nicer with --first-parent request-pull: explicitly ask tags/$name to be pulled tests: add write_script helper function parse_date(): allow ancient git-timestamp parse_date(): '@' prefix forces git-timestamp merge: do not create a signed tag merge under --ff-only option branch --edit-description: protect against mistyped branch name Git 1.7.6.6 Prepare for 1.7.9.1 tag: do not show non-tag contents with "-n" merge: do not launch an editor on "--no-edit $tag" Update draft release notes to 1.7.9.1 Update draft release notes to 1.7.9.1 Git 1.7.9.1 Michael J Gruber (1): t5541: avoid TAP test miscounting Michael Palimaka (1): Explicitly set X to avoid potential build breakage Shawn O. Pearce (1): remote-curl: Fix push status report when all branches fail Ævar Arnfjörð Bjarmason (3): Makefile: Change the default compiler from "gcc" to "cc" Remove Git's support for smoke testing t: use sane_unset instead of unset Version v1.7.9; changes since v1.7.9-rc2: ----------------------------------------- Felipe Contreras (1): git-completion: workaround zsh COMPREPLY bug Jeff King (1): docs: minor grammar fixes for v1.7.9 release notes Junio C Hamano (2): INSTALL: warn about recent Fedora breakage Git 1.7.9 Michael Haggerty (1): Fix typo in 1.7.9 release notes Version v1.7.9-rc2; changes since v1.7.9-rc1: --------------------------------------------- Jakub Narębski (2): gitweb: Fix file links in "grep" search gitweb: Harden "grep" search against filenames with ':' Jeff King (3): unix-socket: handle long socket pathnames credential-cache: report more daemon connection errors credential-cache: ignore "connection refused" errors Jonathan Nieder (1): unix-socket: do not let close() or chdir() clobber errno during cleanup Junio C Hamano (4): pulling signed tag: add howto document Git 1.7.7.6 Git 1.7.8.4 Git 1.7.9-rc2 Michael Haggerty (2): git-show-ref: fix escaping in asciidoc source git-show-ref doc: typeset regexp in fixed width font Nguyễn Thái Ngọc Duy (3): Document limited recursion pathspec matching with wildcards diff-index: enable recursive pathspec matching in unpack_trees diff-index: enable recursive pathspec matching in unpack_trees Thomas Rast (1): word-diff: ignore '\ No newline at eof' marker Version v1.7.9-rc1; changes since v1.7.9-rc0: --------------------------------------------- Ben Walton (1): Use perl instead of sed for t8006-blame-textconv test Carlos Martín Nieto (1): archive: re-allow HEAD:Documentation on a remote invocation Clemens Buchacher (1): credentials: unable to connect to cache daemon Jeff King (5): send-email: multiedit is a boolean config option attr: don't confuse prefixes with leading directories attr: drop misguided defensive coding attr: fix leak in free_attr_elem thin-pack: try harder to use preferred base objects as base Junio C Hamano (11): attr.c: make bootstrap_attr_stack() leave early attr.c: clarify the logic to pop attr_stack Documentation: rerere's rr-cache auto-creation and rerere.enabled Prepare for 1.7.6.6 Prepare for 1.7.7.6 Prepare for 1.7.8.4 request-pull: use the real fork point when preparing the message Update draft release notes to 1.7.6.6 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.8.4 Git 1.7.9-rc1 Matthieu Moy (1): gitweb: accept trailing "/" in $project_list Michael Haggerty (3): receive-pack: move more work into write_head_info() show_ref(): remove unused "flag" and "cb_data" arguments write_head_info(): handle "extra refs" locally Nguyễn Thái Ngọc Duy (1): t2203: fix wrong commit command Sebastian Schuberth (2): t9200: On MSYS, do not pass Windows-style paths to CVS git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS Thomas Rast (1): mailinfo documentation: accurately describe non -k case Version v1.7.9-rc0; changes since v1.7.8.6: ------------------------------------------- Anders Kaseorg (2): gitk: Remove unused $cdate array gitk: Remember time zones from author and commit timestamps Bert Wesarg (14): git-gui: fix multi selected file operation git-gui: handle config booleans without value git-gui: add smart case search mode in searchbar git-gui: add regexp search mode to the searchbar git-gui: add search history to searchbar git-gui: fix unintended line break in message string git-gui: use "untracked" for files which are not known to git git-gui: new config to control staging of untracked files git-gui: fix display of path in browser title git-gui: use a tristate to control the case mode in the searchbar git-gui: span widgets over the full file output area in the blame view git-gui: include the file path in guitools confirmation dialog git-gui: make config gui.warndetachedcommit a boolean git-gui: don't warn for detached head when rebasing Dejan Ribič (1): git-gui: fix spelling error in sshkey.tcl Gary Gibbons (5): git-p4: ensure submit clientPath exists before chdir git-p4: use absolute directory for PWD env var git-p4: fix test for unsupported P4 Client Views git-p4: sort client views by reverse View number git-p4: support single file p4 client view maps Gustaf Hendeby (1): Add built-in diff patterns for MATLAB code Jakub Narębski (6): gitweb: Refactor diff body line classification gitweb: Extract formatting of diff chunk header gitweb: Give side-by-side diff extra CSS styling t9500: Add test for handling incomplete lines in diff by gitweb t9500: Add basic sanity tests for side-by-side diff in gitweb gitweb: Use href(-replay=>1,...) for formats links in "commitdiff" Jeff King (28): prune: handle --progress/no-progress reachable: per-object progress upload-archive: use start_command instead of fork test-lib: add test_config_global variant t5550: fix typo introduce credentials API credential: add function for parsing url components http: use credential API to get passwords credential: apply helper config credential: add credential.*.username credential: make relevance of http path configurable docs: end-user documentation for the credential subsystem credentials: add "cache" helper strbuf: add strbuf_add*_urlencode imap-send: avoid buffer overflow imap-send: don't check return value of git_getpass move git_getpass to its own source file refactor git_getpass into generic prompt function add generic terminal prompt function credentials: add "store" helper prompt: use git_terminal_prompt t: add test harness for external credential helpers credential: use git_prompt instead of git_getpass Makefile: linux has /dev/tty Makefile: OS X has /dev/tty contrib: add credential helper for OS X Keychain test-lib: redirect stdin of tests pretty: give placeholders to reflog identity Joey Hess (1): write first for-merge ref to FETCH_HEAD first Johannes Sixt (1): Makefile: unix sockets may not available on some platforms Jonathan Nieder (6): gitk: Make vi-style keybindings more vi-like test: add missing "&&" after echo command test: remove a porcelain test that hard-codes commit names t7501 (commit): modernize style test: commit --amend should honor --no-edit test: errors preparing for a test are not special Jonathon Mah (1): stash: Don't fail if work dir contains file named 'HEAD' Junio C Hamano (50): branch: add read_branch_desc() helper function format-patch: use branch description in cover letter branch: teach --edit-description option request-pull: modernize style request-pull: state what commit to expect request-pull: use the branch description fmt-merge-msg: use branch.$name.description write_pack_header(): a helper function create_tmp_packfile(): a helper function finish_tmp_packfile(): a helper function Split GPG interface into its own helper library merge: notice local merging of tags and keep it unwrapped fetch: allow "git fetch $there v1.0" to fetch a tag refs DWIMmery: use the same rule for both "git fetch" and others fmt-merge-msg: avoid early returns fmt-merge-msg: package options into a structure fmt-merge-msg: Add contents of merged tag in the merge message merge: make usage of commit->util more extensible merge: record tag objects without peeling in MERGE_HEAD request-pull: use the annotated tag contents commit: copy merged signed tags to headers of merge commit merge: force edit and no-ff mode when merging a tag object commit: teach --amend to carry forward extra headers commit-tree: update the command line parsing commit-tree: teach -m/-F options to read logs from elsewhere commit: teach --gpg-sign option log: --show-signature test "commit -S" and "log --show-signature" pretty: %G[?GS] placeholders gpg-interface: allow use of a custom GPG binary csum-file: introduce sha1file_checkpoint bulk-checkin: replace fast-import based implementation Kick-off the 1.7.9 cycle commit: honour --no-edit Update draft release notes for 1.7.9 Update draft release notes to 1.7.9 request-pull: update the "pull" command generation logic Update draft release notes to 1.7.9 request-pull: do not emit "tag" before the tagname Update draft release notes to 1.7.9 commit: do not lose mergetag header when not amending Update draft release notes to 1.7.9 Update draft release notes in preparation for 1.7.9-rc0 Update draft release notes to 1.7.9 verify_signed_buffer: fix stale comment commit --amend -S: strip existing gpgsig headers log-tree.c: small refactor in show_signature() log-tree: show mergetag in log --show-signature output log --show-signature: reword the common two-head merge case Git 1.7.9-rc0 Kato Kazuyoshi (2): gitweb: Add a feature to show side-by-side diff gitweb: Add navigation to select side-by-side diff Kirill A. Shutemov (1): git-tag: introduce --cleanup option Linus Torvalds (1): fetch: do not store peeled tag object names in FETCH_HEAD Martin von Zweigbergk (10): gitk: Fix file highlight when run in subdirectory gitk: Fix "show origin of this line" with separate work tree gitk: Fix "blame parent commit" with separate work tree gitk: Fix "External diff" with separate work tree gitk: Put temporary directory inside .git gitk: Run 'git rev-parse --git-dir' only once gitk: Simplify calculation of gitdir gitk: Show modified files with separate work tree t3401: modernize style t3401: use test_commit in setup Michael Haggerty (16): struct ref_entry: document name member refs: rename "refname" variables refs: rename parameters result -> sha1 clear_ref_array(): rename from free_ref_array() is_refname_available(): remove the "quiet" argument parse_ref_line(): add docstring add_ref(): add docstring is_dup_ref(): extract function from sort_ref_array() refs: change signatures of get_packed_refs() and get_loose_refs() get_ref_dir(): change signature resolve_gitlink_ref(): improve docstring Pass a (ref_cache *) to the resolve_gitlink_*() helper functions resolve_gitlink_ref_recursive(): change to work with struct ref_cache repack_without_ref(): remove temporary create_ref_entry(): extract function from add_ref() add_ref(): take a (struct ref_entry *) parameter Nguyễn Thái Ngọc Duy (14): fsck: return error code when verify_pack() goes wrong verify_packfile(): check as many object as possible in a pack fsck: avoid reading every object twice fsck: print progress prune: show progress while marking reachable objects Convert many resolve_ref() calls to read_ref*() and ref_exists() checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore Copy resolve_ref() return value for longer use revert: convert resolve_ref() to read_ref_full() Convert resolve_ref+xstrdup to new resolve_refdup function Rename resolve_ref() to resolve_ref_unsafe() merge: abort if fails to commit Convert commit_tree() to take strbuf as message commit_tree(): refuse commit messages that contain NULs Pat Thoyts (11): git-gui: include the number of untracked files to stage when asking the user git-gui: theme the search and line-number entry fields on blame screen git-gui: catch invalid or complete regular expressions and treat as no match. git-gui: enable the smart case sensitive search only if gui.search.smartcase is true git-gui: set suitable extended window manager hints. git-gui: support underline style when parsing diff output git-gui: sort the numeric ansi codes git-gui: set whitespace warnings appropriate to this project git-gui: added config gui.gcwarning to disable the gc hint message git-gui: handle shell script text filters when loading for blame. git-gui 0.16 Paul Mackerras (1): gitk: Update copyright Pete Wyckoff (18): git-p4: introduce skipSubmitEdit git-p4: submit test for auto-creating clientPath git-p4: test for absolute PWD problem git-p4: fix skipSubmitEdit regression rename git-p4 tests git-p4: introduce asciidoc documentation git-p4: clone does not use --git-dir git-p4: test cloning with two dirs, clarify doc git-p4: document and test clone --branch git-p4: honor --changesfile option and test git-p4: document and test --import-local git-p4: test --max-changes git-p4: test --keep-path git-p4: test and document --use-client-spec git-p4: document and test submit options git-p4: test client view handling git-p4: rewrite view handling git-p4: view spec documentation Ramkumar Ramachandra (11): t3200 (branch): fix '&&' chaining test: fix '&&' chaining t3030 (merge-recursive): use test_expect_code t1510 (worktree): fix '&&' chaining t3040 (subprojects-basic): fix '&&' chaining, modernize style revert: free msg in format_todo() revert: make commit subjects in insn sheet optional revert: tolerate extra spaces, tabs in insn sheet revert: simplify getting commit subject in format_todo() t3510 (cherry-pick-sequencer): use exit status t3502, t3510: clarify cherry-pick -m failure Ramsay Allan Jones (3): builtin/log.c: Fix an "Using plain integer as NULL pointer" warning environment.c: Fix an sparse "symbol not declared" warning fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error Raphael Zimmerer (1): gitk: When a commit contains a note, mark it with a yellow box René Scharfe (5): read-cache.c: allocate index entries individually cache.h: put single NUL at end of struct cache_entry use struct sha1_array in diff_tree_combined() pass struct commit to diff_tree_combined_merge() submodule: use diff_tree_combined_merge() instead of diff_tree_combined() SZEDER Gábor (9): completion: document __gitcomp() completion: optimize refs completion completion: make refs completion consistent for local and remote repos completion: improve ls-remote output filtering in __git_refs() completion: support full refs from remote repositories completion: query only refs/heads/ in __git_refs_remotes() completion: improve ls-remote output filtering in __git_refs_remotes() completion: fast initial completion for config 'remote.*.fetch' value completion: remove broken dead code from __git_heads() and __git_tags() Samuel Bronson (1): git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming. Steven Walter (1): git-svn.perl: close the edit for propedits even with no mods Thomas Rast (5): grep: load funcname patterns for -W grep: enable threading with -p and -W using lazy attribute lookup grep: disable threading in non-worktree case test-terminal: set output terminals to raw mode bash completion: use read -r everywhere Tilman Vogel (1): git-gui: add config value gui.diffopts for passing additional diff options Vincent van Ravesteijn (4): Compile fix for MSVC: Do not include sys/resources.h Compile fix for MSVC: Include MSVC: Remove unneeded header stubs Show error for 'git merge' with unset merge.defaultToUpstream Yggy King (1): gitk: Make "touching paths" search support backslashes Ævar Arnfjörð Bjarmason (5): pull: introduce a pull.rebase option to enable --rebase i18n: add infrastructure for translating Git with gettext Fix an enum assignment issue spotted by Sun Studio Fix a bitwise negation assignment issue spotted by Sun Studio Appease Sun Studio by renaming "tmpfile" Version v1.7.8.6; changes since v1.7.8.5: ----------------------------------------- Carlos Martín Nieto (1): Documentation: use {asterisk} in rev-list-options.txt when needed Clemens Buchacher (1): t5541: check error message against the real port number used D Waitzman (1): Documentation/gitweb: trivial English fixes Jakub Narębski (1): gitweb: Fix actionless dispatch for non-existent objects Johannes Sixt (1): t0090: be prepared that 'wc -l' writes leading blanks Jonathan Nieder (1): bundle: remove stray single-quote from error message Junio C Hamano (4): i18n of multi-line advice messages fetch/receive: remove over-pessimistic connectivity check Git 1.7.7.7 Git 1.7.8.6 Kirill Smelkov (1): t/Makefile: Use $(sort ...) explicitly where needed Phil Hord (1): rerere: Document 'rerere remaining' Shawn O. Pearce (1): remote-curl: Fix push status report when all branches fail Thomas Rast (13): Add test-scrap-cache-tree Test the current state of the cache-tree optimization Refactor cache_tree_update idiom from commit commit: write cache-tree data when writing index anyway reset: update cache-tree data when appropriate bundle: put strbuf_readline_fd in strbuf.c with adjustments bundle: use a strbuf to scan the log for boundary commits strbuf: improve strbuf_get*line documentation t5704: match tests to modern style t5510: refactor bundle->pack conversion t5510: ensure we stay in the toplevel test dir bundle: keep around names passed to add_pending_object() Document the --histogram diff option Version v1.7.8.5; changes since v1.7.8.4: ----------------------------------------- Andrew Wong (1): rebase -m: only call "notes copy" when rewritten exists and is non-empty Dmitry V. Levin (1): Makefile: add thread-utils.h to LIB_H Jeff King (1): imap-send: remove dead code Jim Meyering (1): am: don't infloop for an empty input file Junio C Hamano (2): Git 1.7.6.6 Git 1.7.8.5 Michał Kiedrowicz (1): grep -P: Fix matching ^ and $ Version v1.7.8.4; changes since v1.7.8.3: ----------------------------------------- Jeff King (5): send-email: multiedit is a boolean config option attr: don't confuse prefixes with leading directories attr: drop misguided defensive coding attr: fix leak in free_attr_elem thin-pack: try harder to use preferred base objects as base Junio C Hamano (11): attr.c: make bootstrap_attr_stack() leave early attr.c: clarify the logic to pop attr_stack Documentation: rerere's rr-cache auto-creation and rerere.enabled Prepare for 1.7.6.6 Prepare for 1.7.7.6 Prepare for 1.7.8.4 Update draft release notes to 1.7.6.6 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.8.4 Git 1.7.7.6 Git 1.7.8.4 Nguyễn Thái Ngọc Duy (2): t2203: fix wrong commit command diff-index: enable recursive pathspec matching in unpack_trees Version v1.7.8.3; changes since v1.7.8.2: ----------------------------------------- Brian Harring (1): fix hang in git fetch if pointed at a 0 length bundle Clemens Buchacher (2): Documentation: read-tree --prefix works with existing subtrees t5550: repack everything into one file Jack Nagel (1): Add MYMETA.json to perl/.gitignore Jakub Narębski (1): gitweb: Fix fallback mode of to_utf8 subroutine Jens Lehmann (1): docs: describe behavior of relative submodule URLs Junio C Hamano (1): Git 1.7.8.3 Jürgen Kreileder (3): gitweb: Call to_utf8() on input string in chop_and_escape_str() gitweb: esc_html() site name for title in OPML gitweb: Output valid utf8 in git_blame_common('data') Nguyễn Thái Ngọc Duy (1): Catch invalid --depth option passed to clone or fetch Thomas Rast (1): Documentation: rerere.enabled is the primary way to configure rerere Version v1.7.8.2; changes since v1.7.8.1: ----------------------------------------- Andrew Wong (1): rebase -i: interrupt rebase when "commit --amend" failed during "reword" Conrad Irwin (1): Update documentation for stripspace Eric Wong (1): enable SO_KEEPALIVE for connected TCP sockets Erik Faye-Lund (2): compat/setenv.c: update errno when erroring out compat/setenv.c: error if name contains '=' Jeff King (20): read-cache: let refresh_cache_ent pass up changed flags refresh_index: rename format variables refresh_index: make porcelain output more specific compat/snprintf: don't look at va_list twice docs: mention "-k" for both forms of "git mv" mv: honor --verbose flag mv: make non-directory destination error more clear mv: improve overwrite warning mv: be quiet about overwriting drop "match" parameter from get_remote_heads t5500: give fully-qualified refs to fetch-pack fetch-pack: match refs exactly connect.c: drop path_match function t5540: test DAV push with authentication http-push: enable "proactive auth" use custom rename score during --follow docs: brush up obsolete bits of git-fsck manpage make "git push -v" actually verbose commit, merge: initialize static strbuf remote-curl: don't pass back fake refs Jelmer Vernooij (1): Fix an incorrect reference to --set-all. Johan Herland (3): t9301: Fix testcase covering up a bug in fast-import's notes fanout handling t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling fast-import: Fix incorrect fanout level when modifying existing notes refs Johannes Sixt (1): Compatibility: declare strtoimax() under NO_STRTOUMAX Jonathan Nieder (9): branch: allow a no-op "branch -M HEAD" Allow checkout -B to update the current branch revert: give --continue handling its own function revert: allow cherry-pick --continue to commit before resuming revert: pass around rev-list args in already-parsed form revert: allow single-pick in the middle of cherry-pick sequence revert: do not remove state until sequence is finished Revert "reset: Make reset remove the sequencer state" revert: stop creating and removing sequencer-old directory Junio C Hamano (5): checkout -m: no need to insist on having all 3 stages checkout_merged(): squelch false warning from some gcc lf_to_crlf_filter(): resurrect CRLF->CRLF hack advice: Document that they all default to true Git 1.7.8.2 Nick Alcock (2): Add strtoimax() compatibility function. Support sizes >=2G in various config options accepting 'g' sizes. Pete Harlan (1): Test 'checkout -m -- path' Thomas Jarosch (1): imap-send: Remove unused 'use_namespace' variable Thomas Rast (1): git-sh-setup: make require_clean_work_tree part of the interface Ævar Arnfjörð Bjarmason (1): t/t2023-checkout-m.sh: fix use of test_must_fail Version v1.7.8.1; changes since v1.7.8: --------------------------------------- Brandon Casey (2): t/t4131-apply-fake-ancestor.sh: fix broken test builtin/apply.c: report error on failure to recognize input Carlos Martín Nieto (2): convert: track state in LF-to-CRLF filter clone: the -o option has nothing to do with Erik Faye-Lund (1): mingw: give waitpid the correct signature Jack Nagel (1): Documentation: fix formatting error in merge-options.txt Jeff King (5): http: drop "local" member from request struct archive: don't let remote clients get unreachable commits stripspace: fix outdated comment fetch: create status table using strbuf blame: don't overflow time buffer Jens Lehmann (1): diff/status: print submodule path when looking for changes fails Junio C Hamano (9): get_tree_entry(): do not call find_tree_entry() on an empty tree unpack_object_header_buffer(): clear the size field upon error receive-pack, fetch-pack: reject bogus pack that records objects twice pack-object: tolerate broken packs that have duplicated objects Git 1.7.6.5 Git 1.7.7.5 Update draft release notes for 1.7.8.1 lf_to_crlf_filter(): tell the caller we added "\n" when draining Git 1.7.8.1 Martin von Zweigbergk (1): am: don't persist keepcr flag Michael Haggerty (1): git symbolic-ref: documentation fix Michael Schubert (2): builtin/commit: add missing '/' in help message builtin/log: remove redundant initialization Mika Fischer (3): http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping http.c: Use timeout suggested by curl instead of fixed 50ms timeout http.c: Rely on select instead of tracking whether data was received Nguyễn Thái Ngọc Duy (5): tree-walk.c: do not leak internal structure in tree_entry_len() read_directory_recursive: reduce one indentation level tree_entry_interesting(): give meaningful names to return values tree_entry_interesting: make use of local pointer "item" checkout,merge: loosen overwriting untracked file check based on info/exclude Sebastian Morr (1): Add MYMETA.yml to perl/.gitignore Thomas Rast (1): userdiff: allow * between cpp funcname words Ævar Arnfjörð Bjarmason (3): apply: get rid of useless x < 0 comparison on a size_t type cast variable in call to free() in builtin/diff.c and submodule.c builtin/init-db.c: eliminate -Wformat warning on Solaris Version v1.7.8; changes since v1.7.8-rc4: ----------------------------------------- Junio C Hamano (1): Git 1.7.8 Version v1.7.8-rc4; changes since v1.7.8-rc3: --------------------------------------------- Johannes Sixt (1): Fix revert --abort on Windows Jonathan Nieder (11): do not let git_path clobber errno when reporting errors notes merge: eliminate OUTPUT macro Makefile: add missing header file dependencies Makefile: add option to disable automatic dependency generation revert: rename --reset option to --quit revert: rearrange pick_revisions() for clarity revert: improve error message for cherry-pick during cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: introduce --abort to cancel a failed cherry-pick revert: remove --reset compatibility option revert --abort: do not leave behind useless sequencer-old directory Junio C Hamano (5): name-rev --all: do not even attempt to describe non-commit object Git 1.7.7.4 Hopefully final update of release notes before 1.7.8 final Update 1.7.8 draft release notes in preparation for rc4 Git 1.7.8-rc4 Marc-André Lureau (1): mailmap: xcalloc mailmap_info Nguyễn Thái Ngọc Duy (1): revert: do not pass non-literal string as format to git_path() Ramkumar Ramachandra (4): http: remove unused function hex() convert: don't mix enum with int sha1_file: don't mix enum with int git-compat-util: don't assume value for undefined variable Ramsay Allan Jones (3): t5501-*.sh: Fix url passed to clone in setup test config.c: Fix a static buffer overwrite bug by avoiding mkpath() convert.c: Fix return type of git_path_check_eol() Thomas Hochstein (1): documentation fix: git difftool uses diff tools, not merge tools. Vincent van Ravesteijn (2): builtin-branch: Fix crash on invalid use of --force builtin-reset: Documentation update Version v1.7.8-rc3; changes since v1.7.8-rc2: --------------------------------------------- Junio C Hamano (3): Revert "upload-archive: use start_command instead of fork" refs: loosen over-strict "format" check Git 1.7.8-rc3 Ramkumar Ramachandra (1): revert: prettify fatal messages Version v1.7.8-rc2; changes since v1.7.8-rc1: --------------------------------------------- Felipe Contreras (1): remote: fix remote set-url usage Jeff King (1): docs: don't mention --quiet or --exit-code in git-log(1) Junio C Hamano (5): remote: fix set-branches usage docs: Update install-doc-quick Git 1.7.7.3 Update draft release notes to 1.7.8 Git 1.7.8-rc2 Liu Yuan (1): mktree: fix a memory leak in write_tree() SZEDER Gábor (1): completion: don't leak variable from the prompt into environment Version v1.7.8-rc1; changes since v1.7.8-rc0: --------------------------------------------- Dan McGee (4): pack-objects: mark add_to_write_order() as inline pack-objects: use unsigned int for counter and offset values pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: don't traverse objects unnecessarily Erik Faye-Lund (4): mingw: move poll out of sys-folder compat/win32/poll.c: upgrade from upstream upload-archive: use start_command instead of fork mingw: poll.h is no longer in sys/ Johannes Sixt (1): name-hash.c: always initialize dir_next pointer Junio C Hamano (5): (squash) test for previous Git 1.7.7.2 Update draft release notes to 1.7.8 receive-pack: do not expect object 0{40} to exist Git 1.7.8-rc1 Nguyễn Thái Ngọc Duy (2): pretty.c: free get_header() return value pretty.c: use original commit message if reencoding fails Pat Thoyts (1): t7511: avoid use of reserved filename on Windows. Pete Wyckoff (1): git-p4: ignore apple filetype Sebastian Schuberth (2): blame.c: Properly initialize strbuf after calling, textconv_object() blame.c: Properly initialize strbuf after calling textconv_object(), again Stefan Naewe (2): t3200: add test case for 'branch -m' http: don't always prompt for password Tay Ray Chuan (1): branch -m: handle no arg properly Ted Percival (1): svn: Quote repository root in regex match Ævar Arnfjörð Bjarmason (2): t/t6030-bisect-porcelain.sh: use test_i18ngrep t/t7508-status.sh: use test_i18ncmp Version v1.7.8-rc0; changes since v1.7.7.7: ------------------------------------------- Bert Wesarg (7): grep: do not use --index in the short usage output grep --no-index: don't use git standard exclusions git-gui: search and linenumber input are mutual exclusive in the blame view git-gui: only accept numbers in the goto-line input git-gui: clear the goto line input when hiding git-gui: incremental goto line in blame view grep: fix the error message that mentions --exclude Brad King (2): submodule: Demonstrate known breakage during recursive merge submodule: Search for merges only at end of recursive merge Brandon Casey (8): t/t3905: use the name 'actual' for test output, swap arguments to test_cmp git-stash.sh: fix typo in error message t/t3905: add missing '&&' linkage git-stash: remove untracked/ignored directories when stashed refs.c: ensure struct whose member may be passed to realloc is initialized refs.c: abort ref search if ref array is empty refs.c: free duplicate entries in the ref array instead of leaking them t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script Carlos Martín Nieto (1): Documentation: update [section.subsection] to reflect what git does Chris Packham (1): git-web--browse: avoid the use of eval Christoffer Pettersson (1): git-gui: Corrected a typo in the Swedish translation of 'Continue' Clemens Buchacher (5): remove prefix argument from pathspec_prefix rename pathspec_prefix() to common_prefix() and move to dir.[ch] send-email: add option -h use -h for synopsis and --help for manpage consistently use test number as port number Cord Seele (3): Add Git::config_path() use new Git::config_path() for aliasesfile send-email: Fix %config_path_settings handling Dan McGee (2): tree-walk: drop unused parameter from match_dir_prefix tree-walk: micro-optimization in tree_entry_interesting David Aguilar (1): Makefile: Improve compiler header dependency check David Fries (2): git-gui: Enable jumping to a specific line number in blame view. git-gui: Add keyboard shortcuts for search and goto commands in blame view. Dmitry Ivankov (3): Fix typo: existant->existent fast-import: don't allow to tag empty branch fast-import: don't allow to note on empty branch Drew Northup (1): gitweb: Add gitweb.conf(5) manpage for gitweb configuration files Erik Faye-Lund (2): enter_repo: do not modify input mingw: avoid using strbuf in syslog Fredrik Gustafsson (2): rev-parse: add option --resolve-git-dir Move git-dir for submodules Fredrik Kuivinen (1): Makefile: Use computed header dependencies if the compiler supports it Frédéric Heitzmann (1): git svn dcommit: new option --interactive. Giuseppe Bilotta (1): am: preliminary support for hg patches Heiko Voigt (4): git-gui: warn when trying to commit on a detached head submodule: move update configuration variable further up add update 'none' flag to disable update of submodule by default git-gui: deal with unknown files when pressing the "Stage Changed" button Hui Wang (1): sha1_file: normalize alt_odb path before comparing and storing Jakub Narębski (5): gitweb: Add gitweb(1) manpage for gitweb itself Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages Documentation: Add gitweb config variables to git-config(1) gitweb: Add gitweb manpages to 'gitweb' package in git.spec Add simple test for Git::config_path() in t/t9700-perl-git.sh Jay Soffian (5): Teach '--cached' option to check-attr log --children revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so cherry-pick: do not give irrelevant advice when cherry-pick punted Teach merge the '[-e|--edit]' option Jeff King (20): url: decode buffers that are not NUL-terminated improve httpd auth tests remote-curl: don't retry auth failures with dumb protocol http: retry authentication failures for all http requests t7004: factor out gpg setup t6300: add more body-parsing tests for-each-ref: refactor subject and body placeholder parsing for-each-ref: handle multiline subjects like --pretty t3200: clean up checks for file existence fix phantom untracked files when core.ignorecase is set t1300: put git invocations inside test function t1300: test mixed-case variable retrieval pack-objects: protect against disappearing packs downgrade "packfile cannot be accessed" errors to warnings daemon: give friendlier error messages to clients http_init: accept separate URL parameter contrib: add diff highlight script tests: add missing executable bits contrib: add git-jump script completion: match ctags symbol names in grep patterns Jeremie Nikaes (1): Add a remote helper to interact with mediawiki (fetch & push) Johannes Schindelin (5): Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile t1020: disable the pwd test on MinGW t9001: do not fail only due to CR/LF issues t9300: do not run --cat-blob-fd related tests on MinGW git grep: be careful to use mutexes only when they are initialized Johannes Sixt (2): t1402-check-ref-format: skip tests of refs beginning with slash on Windows t1300: attempting to remove a non-existent .git/config is not an error Jonathan Nieder (3): ident: check /etc/mailname if email is unknown ident: do not retrieve default ident when unnecessary Makefile: fix permissions of mergetools/ checked out with permissive umask Julian Phillips (2): Don't sort ref_list too early refs: Use binary search to lookup refs faster Junio C Hamano (47): rev-list: fix finish_object() call revision.c: add show_object_with_name() helper function revision.c: update show_object_with_name() without using malloc() list-objects: pass callback data to show_objects() rev-list --verify-object fetch: verify we have everything we need before updating our ref fetch.fsckobjects: verify downloaded objects transfer.fsckobjects: unify fetch/receive.fsckobjects test: fetch/receive with fsckobjects consolidate pathspec_prefix and common_prefix fetch: verify we have everything we need before updating our ref check_everything_connected(): refactor to use an iterator check_everything_connected(): libify receive-pack: check connectivity before concluding "git push" builtin/revert.c: make commit_list_append() static refs.c: make create_cached_refs() static send-pack: typofix error message rename "match_refs()" to "match_push_refs()" Allow git merge ":/" ls-remote: a lone "-h" is asking for help t0003: remove extra whitespaces parse-options: deprecate OPT_BOOLEAN archive.c: use OPT_BOOL() url.c: simplify is_url() grep: teach --untracked and --exclude-standard options Post 1.7.7 first wave Update draft release notes to 1.7.8 refs.c: move dwim_ref()/dwim_log() from sha1_name.c Update draft release notes to 1.7.8 bundle: allowing to read from an unseekable fd bundle: add parse_bundle_header() helper function Update draft release notes to 1.7.8 t7800: avoid arithmetic expansion notation Update draft release notes to 1.7.8 resolve_gitlink_packed_ref(): fix mismerge Update draft release notes to 1.7.8 Makefile: ask "ls-files" to list source files if available libperl-git: refactor Git::config_* Update draft release notes to 1.7.8 resolve_ref(): expose REF_ISBROKEN flag resolve_ref(): report breakage to the caller without warning Update draft release notes to 1.7.8 builtin/grep: make lock/unlock into static inline functions builtin/grep: simplify lock_and_read_sha1_file() Update draft release notes to 1.7.8 Update draft release notes to 1.7.8 Git 1.7.8-rc0 Luke Diamand (1): git-p4: handle files with shell metacharacters Lénaïc Huard (1): gitweb: provide a way to customize html headers Matthieu Moy (6): git-remote-mediawiki: allow push to set MediaWiki metadata git-remote-mediawiki: trivial fixes git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts git-remote-mediawiki: obey advice.pushNonFastForward git-remote-mediawiki: allow a domain to be set for authentication git-remote-mediawiki: don't include HTTP login/password in author Michael Haggerty (36): Extract a function clear_cached_refs() Access reference caches only through new function get_cached_refs() Change the signature of read_packed_refs() Allocate cached_refs objects dynamically Store the submodule name in struct cached_refs Retain caches of submodule refs get_sha1_hex(): do not read past a NUL character t1402: add some more tests git check-ref-format: add options --allow-onelevel and --refspec-pattern Change bad_ref_char() to return a boolean value Change check_ref_format() to take a flags argument Refactor check_refname_format() Do not allow ".lock" at the end of any refname component Make collapse_slashes() allocate memory for its result Inline function refname_format_print() Change check_refname_format() to reject unnormalized refnames resolve_ref(): explicitly fail if a symlink is not readable resolve_ref(): use prefixcmp() resolve_ref(): only follow a symlink that contains a valid, normalized refname resolve_ref(): turn buffer into a proper string as soon as possible resolve_ref(): extract a function get_packed_ref() resolve_ref(): do not follow incorrectly-formatted symbolic refs remote: use xstrdup() instead of strdup() remote: avoid passing NULL to read_ref() resolve_ref(): verify that the input refname has the right format resolve_ref(): emit warnings for improperly-formatted references resolve_ref(): also treat a too-long SHA1 as invalid resolve_ref(): expand documentation add_ref(): verify that the refname is formatted correctly invalidate_ref_cache(): rename function from invalidate_cached_refs() invalidate_ref_cache(): take the submodule as parameter invalidate_ref_cache(): expose this function in the refs API clear_ref_cache(): rename parameter clear_ref_cache(): extract two new functions write_ref_sha1(): only invalidate the loose ref cache clear_ref_cache(): inline function Michael J Gruber (7): t6040: test branch -vv git-tag: introduce long forms for the options git-branch: introduce missing long forms for the options branch: introduce --list option branch: allow pattern arguments branch: -v does not automatically imply --list http: use hostname in credential description Michael W. Olson (1): git-svn: Allow certain refs to be ignored Michał Górny (1): for-each-ref: add split message parts to %(contents:*). Nguyễn Thái Ngọc Duy (6): sparse checkout: show error messages when worktree shaping fails Add explanation why we do not allow to sparse checkout to empty working tree pack-protocol: document "ERR" line daemon: return "access denied" if a service is not allowed daemon: log errors if we could not use some sockets t5403: convert leading spaces to tabs Pang Yan Han (1): receive-pack: don't pass non-existent refs to post-{receive,update} hooks Pat Thoyts (6): git-gui: updated translator README for current procedures. Fix tooltip display with multiple monitors on windows. git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. mergetools: use the correct tool for Beyond Compare 3 on Windows mingw: ensure sockets are initialized before calling gethostname t9901: fix line-ending dependency on windows Pete Wyckoff (5): git-p4 tests: refactor and cleanup git-p4: handle utf16 filetype properly git-p4: recognize all p4 filetypes git-p4: stop ignoring apple filetype git-p4: keyword flattening fixes Peter Oberndorfer (1): "rebase -i": support special-purpose editor to edit insn sheet Phil Hord (3): Learn to handle gitfiles in enter_repo Teach transport about the gitfile mechanism Add test showing git-fetch groks gitfiles Ramkumar Ramachandra (18): advice: Introduce error_resolve_conflict config: Introduce functions to write non-standard file revert: Simplify and inline add_message_to_msg revert: Don't check lone argument in get_encoding revert: Rename no_replay to record_origin revert: Eliminate global "commit" variable revert: Introduce struct to keep command-line options revert: Separate cmdline parsing from functional code revert: Don't create invalid replay_opts in parse_args revert: Save data for continuing after conflict resolution revert: Save command-line options for continuing operation revert: Make pick_commits functionally act on a commit list revert: Introduce --reset to remove sequencer state reset: Make reset remove the sequencer state revert: Remove sequencer state when no commits are pending revert: Don't implicitly stomp pending sequencer operation revert: Introduce --continue to continue the operation revert: Propagate errors upwards from do_pick_commit Ramsay Allan Jones (5): Makefile: Make dependency directory creation less noisy sparse: Fix an "Using plain integer as NULL pointer" warning obstack.c: Fix some sparse warnings Fix some "variable might be used uninitialized" warnings gitweb/Makefile: Remove static/gitweb.js in the clean target René Scharfe (23): parseopt: add OPT_NOOP_NOARG revert: use OPT_NOOP_NOARG apply: use OPT_NOOP_NOARG checkout: check for "Previous HEAD" notice in t2020 revision: factor out add_pending_sha1 checkout: use add_pending_{object,sha1} in orphan check revision: add leak_pending flag bisect: use leak_pending flag bundle: use leak_pending flag checkout: use leak_pending flag commit: factor out clear_commit_marks_for_object_array test-ctype: macrofy test-ctype: add test for is_pathspec_magic name-rev: split usage string pickaxe: plug diff filespec leak with empty needle pickaxe: plug regex leak pickaxe: plug regex/kws leak pickaxe: factor out has_changes pickaxe: pass diff_options to contains and has_changes pickaxe: give diff_grep the same signature as has_changes pickaxe: factor out pickaxe xdiff: factor out get_func_line() diff: add option to show whole functions as context SZEDER Gábor (2): completion: unite --reuse-message and --reedit-message for 'notes' completion: unite --format and --pretty for 'log' and 'show' Sebastian Schuberth (2): git-svn: On MSYS, escape and quote SVN_SSH also if set by the user inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables Sitaram Chamarty (1): git-difftool: allow skipping file by typing 'n' at prompt Stefan Naewe (1): completion: fix issue with process substitution not working on Git for Windows Tay Ray Chuan (3): fetch: plug two leaks on error exit in store_updated_refs submodule: whitespace fix submodule::module_clone(): silence die() message from module_name() Teemu Matilainen (3): completion: unite --reuse-message and --reedit-message handling completion: commit --fixup and --squash completion: push --set-upstream Zbigniew Jędrzejewski-Szmek (1): send-email: auth plain/login fix Version v1.7.7.7; changes since v1.7.7.6: ----------------------------------------- Jeff King (1): imap-send: remove dead code Jonathan Nieder (1): bundle: remove stray single-quote from error message Junio C Hamano (2): Git 1.7.6.6 Git 1.7.7.7 Thomas Rast (1): Document the --histogram diff option Version v1.7.7.6; changes since v1.7.7.5: ----------------------------------------- Clemens Buchacher (1): Documentation: read-tree --prefix works with existing subtrees Jack Nagel (1): Add MYMETA.json to perl/.gitignore Jeff King (4): attr: don't confuse prefixes with leading directories attr: drop misguided defensive coding attr: fix leak in free_attr_elem thin-pack: try harder to use preferred base objects as base Jens Lehmann (1): docs: describe behavior of relative submodule URLs Junio C Hamano (8): attr.c: make bootstrap_attr_stack() leave early attr.c: clarify the logic to pop attr_stack Documentation: rerere's rr-cache auto-creation and rerere.enabled Prepare for 1.7.6.6 Prepare for 1.7.7.6 Update draft release notes to 1.7.6.6 Update draft release notes to 1.7.7.6 Git 1.7.7.6 Nguyễn Thái Ngọc Duy (2): t2203: fix wrong commit command diff-index: enable recursive pathspec matching in unpack_trees Thomas Rast (1): Documentation: rerere.enabled is the primary way to configure rerere Version v1.7.7.5; changes since v1.7.7.4: ----------------------------------------- Erik Faye-Lund (1): mingw: give waitpid the correct signature Jeff King (3): stripspace: fix outdated comment fetch: create status table using strbuf blame: don't overflow time buffer Junio C Hamano (2): Git 1.7.6.5 Git 1.7.7.5 Martin von Zweigbergk (1): am: don't persist keepcr flag Michael Haggerty (1): git symbolic-ref: documentation fix Nguyễn Thái Ngọc Duy (1): checkout,merge: loosen overwriting untracked file check based on info/exclude Sebastian Morr (1): Add MYMETA.yml to perl/.gitignore Thomas Hochstein (1): documentation fix: git difftool uses diff tools, not merge tools. Ævar Arnfjörð Bjarmason (2): apply: get rid of useless x < 0 comparison on a size_t type cast variable in call to free() in builtin/diff.c and submodule.c Version v1.7.7.4; changes since v1.7.7.3: ----------------------------------------- Jonathan Nieder (2): notes merge: eliminate OUTPUT macro Makefile: add missing header file dependencies Junio C Hamano (2): name-rev --all: do not even attempt to describe non-commit object Git 1.7.7.4 Marc-André Lureau (1): mailmap: xcalloc mailmap_info Version v1.7.7.3; changes since v1.7.7.2: ----------------------------------------- Dan McGee (4): pack-objects: mark add_to_write_order() as inline pack-objects: use unsigned int for counter and offset values pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: don't traverse objects unnecessarily Jeff King (1): docs: don't mention --quiet or --exit-code in git-log(1) Julien Muchembled (1): gitweb: fix regression when filtering out forks Junio C Hamano (3): branch -m/-M: remove undocumented RENAMED-REF docs: Update install-doc-quick Git 1.7.7.3 Version v1.7.7.2; changes since v1.7.7.1: ----------------------------------------- Brandon Casey (4): attr.c: avoid inappropriate access to strbuf "buf" member cleanup: use internal memory allocation wrapper functions everywhere builtin/mv.c: plug miniscule memory leak attr.c: respect core.ignorecase when matching attribute patterns Carlos Martín Nieto (6): Remove 'working copy' from the documentation and C code fetch: free all the additional refspecs t5510: add tests for fetch --prune remote: separate out the remote_find_tracking logic into query_refspecs fetch: honor the user-provided refspecs when pruning refs fetch: treat --tags like refs/tags/*:refs/tags/* when pruning Christian Couder (1): bisect: fix exiting when checkout failed in bisect_start() Haitao Li (1): date.c: Support iso8601 timezone formats Jakub Narębski (1): gitweb: Strip non-printable characters from syntax highlighter output Jeff King (8): add sha1_array API docs quote.h: fix bogus comment refactor argv_array into generic code quote: provide sq_dequote_to_argv_array bisect: use argv_array API checkout: use argv_array API run_hook: use argv_array API pull,rebase: handle GIT_WORK_TREE better Jim Meyering (1): make the sample pre-commit hook script reject names with newlines, too Jonathan Nieder (2): http: remove extra newline in error message http: avoid empty error messages for some curl errors Jonathon Mah (1): mergetool: Use args as pathspec to unmerged files Junio C Hamano (5): refactor run_receive_hook() diff: teach --stat/--numstat to honor -U$num mergetool: no longer need to save standard input attr: read core.attributesfile from git_default_core_config Git 1.7.7.2 Martin von Zweigbergk (4): remote: write correct fetch spec when renaming remote 'remote' remote: "rename o foo" should not rename ref "origin/bar" remote rename: warn when refspec was not updated remote: only update remote-tracking branch if updating refspec Matthew Daley (1): send-email: Honour SMTP domain when using TLS Michael Haggerty (1): notes_merge_commit(): do not pass temporary buffer to other function Michael J Gruber (3): unpack-trees: print "Aborting" to stderr git-read-tree.txt: language and typography fixes git-read-tree.txt: correct sparse-checkout and skip-worktree description Nguyễn Thái Ngọc Duy (2): git-read-tree.txt: update sparse checkout examples Reindent closing bracket using tab instead of spaces Pat Thoyts (1): t7511: avoid use of reserved filename on Windows. Peter Stuge (1): gitweb: Fix links to lines in blobs when javascript-actions are enabled Ramsay Allan Jones (1): t9159-*.sh: skip for mergeinfo test for svn <= 1.4 René Scharfe (1): read-cache.c: fix index memory allocation Richard Hartmann (1): clone: Quote user supplied path in a single quote pair Shawn O. Pearce (1): remote-curl: Fix warning after HTTP failure Stefan Naewe (1): Documentation/git-update-index: refer to 'ls-files' Thomas Rast (1): Documentation: basic configuration of notes.rewriteRef Version v1.7.7.1; changes since v1.7.7: --------------------------------------- Brad King (1): rev-list: Demonstrate breakage with --ancestry-path --all Brandon Casey (1): strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() Ilari Liusvaara (1): Support ERR in remote archive like in fetch/push Jay Soffian (1): merge-one-file: fix "expr: non-numeric argument" Jeff King (2): fetch: avoid quadratic loop checking for updated submodules filter-branch: use require_clean_work_tree Jim Meyering (1): fix "git apply --index ..." not to deref NULL Jonathan Nieder (2): Makefile: do not set setgid bit on directories on GNU/kFreeBSD RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting Junio C Hamano (14): revision: keep track of the end-user input from the command line revision: do not include sibling history in --ancestry-path output rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree traverse_trees(): allow pruning with pathspec unpack-trees: allow pruning with pathspec diff-index: pass pathspec down to unpack-trees machinery fsck: do not abort upon finding an empty blob Teach progress eye-candy to fetch_refs_from_bundle() apply --whitespace=error: correctly report new blank lines at end checkout $tree $path: do not clobber local changes in $path not in $tree diff: resurrect XDF_NEED_MINIMAL with --minimal Prepare for 1.7.7.1 Almost ready for 1.7.7.1 Git 1.7.7.1 Matthieu Moy (2): rebase -i: clean error message for --continue after failed exec config: display key_delim for config --bool --get-regexp Michael Schubert (1): patch-id.c: use strbuf instead of a fixed buffer Nguyễn Thái Ngọc Duy (4): merge: keep stash[] a local variable merge: use return value of resolve_ref() to determine if HEAD is invalid merge: remove global variable head[] Accept tags in HEAD or MERGE_HEAD Nicolas Morey-Chaisemartin (1): grep: Fix race condition in delta_base_cache René Scharfe (2): Revert removal of multi-match discard heuristic in 27af01 t1304: fall back to $USER if $LOGNAME is not defined Thomas Rast (2): Symlink mergetools scriptlets into valgrind wrappers t6019: avoid refname collision on case-insensitive systems Version v1.7.7; changes since v1.7.7-rc3: ----------------------------------------- Gerrit Pape (2): contrib/hooks: adapt comment about Debian install location for contrib hooks templates/hooks--*: remove sample hooks without any functionality Junio C Hamano (2): Documentation/gitnamespaces.txt: cater to older asciidoc Git 1.7.7 Version v1.7.7-rc3; changes since v1.7.7-rc2: --------------------------------------------- Allan Caffee (1): describe: Refresh the index when run with --dirty Jay Soffian (1): git-mergetool: check return value from read Jeff King (1): t4014: clean up format.thread config after each test Junio C Hamano (3): Git 1.7.6.4 merge-recursive: Do not look at working tree during a virtual ancestor merge Git 1.7.7-rc3 Version v1.7.7-rc2; changes since v1.7.7-rc1: --------------------------------------------- Bryan Jacobs (1): git-svn: teach git-svn to populate svn:mergeinfo Frédéric Heitzmann (1): Disambiguate duplicate t9160* tests Junio C Hamano (2): branch --set-upstream: regression fix Git 1.7.7-rc2 Pang Yan Han (1): format-patch: ignore ui.color Version v1.7.7-rc1; changes since v1.7.7-rc0: --------------------------------------------- Ben Walton (2): Documentation: Grammar correction, wording fixes and cleanup Mark http-fetch without -a as deprecated Brandon Casey (1): t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh Brian Gernhardt (1): t5540-http-test: shorten grep pattern Bryan Jacobs (1): git-svn: Teach dcommit --mergeinfo to handle multiple lines Conrad Irwin (2): Prevent force-updating of the current branch Show interpreted branch name in error messages Dmitry Ivankov (11): fast-import: add input format tests fast-import: don't fail on omitted committer name fast-import: check committer name more strictly fsck: add a few committer name tests fsck: improve committer/author check fast-import: add a test for tree delta base corruption fast-import: prevent producing bad delta fast-import: count and report # of calls to diff_delta in stats fast-import: treat cat-blob as a delta base hint for next blob fast-import: add tests for tagging blobs fast-import: allow to tag newly created objects Elijah Newren (55): t6042: Add a testcase where git deletes an untracked file t6042: Add failing testcase for rename/modify/add-source conflict t6042: Add a pair of cases where undetected renames cause issues t6042: Add a testcase where undetected rename causes silent file deletion t6042: Add tests for content issues with modify/rename/directory conflicts t6042: Ensure rename/rename conflicts leave index and workdir in sane state t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts t6036: Add differently resolved modify/delete conflict in criss-cross test t6036: criss-cross with weird content can fool git into clean merge t6036: tests for criss-cross merges with various directory/file conflicts t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify t6022: Remove unnecessary untracked files to make test cleaner t6022: New tests checking for unnecessary updates of files t6022: Add testcase for merging a renamed file with a simple change merge-recursive: Make BUG message more legible by adding a newline merge-recursive: Correct a comment merge-recursive: Mark some diff_filespec struct arguments const merge-recursive: Consolidate different update_stages functions merge-recursive: Remember to free generated unique path names merge-recursive: Avoid working directory changes during recursive case merge-recursive: Fix recursive case with D/F conflict via add/add conflict merge-recursive: Fix sorting order and directory change assumptions merge-recursive: Fix code checking for D/F conflicts still being present merge-recursive: Save D/F conflict filenames instead of unlinking them merge-recursive: Split was_tracked() out of would_lose_untracked() merge-recursive: Allow make_room_for_path() to remove D/F entries merge-recursive: Split update_stages_and_entry; only update stages at end merge-recursive: Fix deletion of untracked file in rename/delete conflicts merge-recursive: Make dead code for rename/rename(2to1) conflicts undead merge-recursive: Add comments about handling rename/add-source cases merge-recursive: Improve handling of rename target vs. directory addition merge-recursive: Consolidate process_entry() and process_df_entry() merge-recursive: Cleanup and consolidation of rename_conflict_info merge-recursive: Provide more info in conflict markers with file renames merge-recursive: When we detect we can skip an update, actually skip it merge-recursive: Fix modify/delete resolution in the recursive case merge-recursive: Introduce a merge_file convenience function merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base merge-recursive: Small cleanups for conflict_rename_rename_1to2 merge-recursive: Defer rename/rename(2to1) handling until process_entry merge-recursive: Record more data needed for merging with dual renames merge-recursive: Create function for merging with branchname:file markers merge-recursive: Consider modifications in rename/rename(2to1) conflicts merge-recursive: Make modify/delete handling code reusable merge-recursive: Have conflict_rename_delete reuse modify/delete code merge-recursive: add handling for rename/rename/add-dest/add-dest merge-recursive: Fix working copy handling for rename/rename/add/add t6022: Add testcase for spurious "refusing to lose untracked" messages merge-recursive: Fix spurious 'refusing to lose untracked file...' messages t6022: Additional tests checking for unnecessary updates of files merge-recursive: Avoid unnecessary file rewrites t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest merge-recursive: Don't re-sort a list whose order we depend upon Eric Wong (1): git-svn: fix fetch with moved path when using rewriteRoot Fredrik Gustafsson (1): push: Don't push a repository with unpushed submodules Fredrik Kuivinen (6): Add obstack.[ch] from EGLIBC 2.10 Add string search routines from GNU grep Adapt the kwset code to Git Use kwset in pickaxe Use kwset in grep obstack: Fix portability issues Giuseppe Bilotta (2): am: format is in $patch_format, not parse_patch am: fix stgit patch mangling Jeff King (12): t3030: fix accidental success in symlink rename t7006: modernize calls to unset test-lib: add helper functions for config t7006: use test_config helpers setup_pager: set GIT_PAGER_IN_USE diff: refactor COLOR_DIFF from a flag into an int git_config_colorbool: refactor stdout_is_tty handling color: delay auto-color decision until point of use config: refactor get_colorbool function diff: don't load color config in plumbing want_color: automatically fallback to color.ui support pager.* for external commands Jens Lehmann (1): fetch: skip on-demand checking when no submodules are configured Johannes Sixt (2): string-list: Add API to remove an item from an unsorted list t3005: do not assume a particular order of stdout and stderr of git-ls-files Jon Seymour (1): bisect: take advantage of gettextln, eval_gettextln. Jonathan Nieder (1): Documentation/remote-helpers: explain capabilities first Junio C Hamano (14): combine-diff: support format_callback read_gitfile_gently(): rename misnamed function to read_gitfile() clone: allow more than one --reference clone: clone from a repository with relative alternates Update draft release notes to 1.7.7 Documentation: clarify "git clean -e " Update draft release notes to 1.7.7 Revert "Merge branch 'cb/maint-quiet-push' into maint" Git 1.7.6.2 Update draft release notes to 1.7.7 Minor update to how-to maintain git Prepare for 1.7.6.3 maintenance release Git 1.7.6.3 Git 1.7.7-rc1 Matthieu Moy (2): Documentation/git-remote-helpers: explain how import works with multiple refs (short) documentation for the testgit remote helper Michael Haggerty (9): Add a file comment Document struct match_attr Increment num_attr in parse_attr_line(), not parse_attr() Change parse_attr() to take a pointer to struct attr_state Determine the start of the states outside of the pass loop Change while loop into for loop Unroll the loop over passes check-ref-format --print: Normalize refnames that start with slashes Forbid DEL characters in reference names Michael J Gruber (3): git-notes.txt: clarify -C vs. copy and -F log: Do not decorate replacements with --no-replace-objects RelNotes/1.7.7: minor fixes Michael Stapelberg (1): git-daemon.txt: specify --timeout in seconds Namhyung Kim (1): branch -v: honor core.abbrev Nguyễn Thái Ngọc Duy (6): decoration: do not mis-decorate refs with same prefix Add for_each_commit_graft() to iterate all grafts Move write_shallow_commits to fetch-pack.c log: decorate grafted commits with "grafted" log: decorate "replaced" on to replaced commits clone: allow to clone from .git file Pete Wyckoff (1): git-p4: simple branch tests edits Ray Chen (1): git-svn: New flag to emulate empty directories Sverre Rabbelier (1): SubmittingPathces: remove Cogito reference Tay Ray Chuan (2): xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() Thomas Rast (8): Use memmove in ident_to_git t4014: check for empty files from git format-patch --stdout t4014: invoke format-patch with --stdout where intended t4014: "no-add-headers" is actually called "no-add-header" Document negated forms of format-patch --to --cc --add-headers strbuf_grow(): maintain nul-termination even for new buffer Documentation: clarify effects of -- arguments t3903: fix misquoted rev-parse invocation Vitor Antunes (9): git-p4: Allow setting rename/copy detection threshold git-p4: Add description of rename/copy detection options git-p4: Add test case for rename detection git-p4: Add test case for copy detection git-p4: Process detectCopiesHarder with --bool git-p4: Correct branch base depot path detection git-p4: Allow filtering Perforce branches by user git-p4: Allow branch definition with git config git-p4: Add simple test case for branch import Version v1.7.7-rc0; changes since v1.7.6.6: ------------------------------------------- Allan Caffee (1): describe: Refresh the index when run with --dirty Andi Kleen (2): Add profile feedback build to git Add explanation of the profile feedback build to the README Clemens Buchacher (1): commit: allow partial commits with relative paths David Aguilar (8): setup: Provide GIT_PREFIX to built-ins git: Remove handling for GIT_PREFIX git-mergetool--lib: Make vimdiff retain the current directory t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests difftool--helper: Make style consistent with git mergetool--lib: Make style consistent with git mergetool--lib: Refactor tools into separate files mergetools/meld: Use '--output' when available David Barr (1): am: ignore leading whitespace before patch David Caldwell (1): stash: Add --include-untracked option to stash and remove all untracked files Dmitry Ivankov (4): remote-helpers: export GIT_DIR variable to helpers parse-options: export opterr, optbug Reduce parse-options.o dependencies doc/fast-import: document feature import-marks-if-exists Duncan Brown (1): http: pass http.cookiefile using CURLOPT_COOKIEFILE Erik Faye-Lund (2): verify_path: consider dos drive prefix connect: only log if all attempts failed (ipv4) Fredrik Gustafsson (2): git-sh-setup: add die_with_status submodule update: continue when a checkout fails Jakub Narębski (14): gitweb.js: No need for inProgress in blame_incremental.js gitweb.js: No need for loop in blame_incremental's handleResponse() gitweb.js: use setTimeout rather than setInterval in blame_incremental.js gitweb: Check permissions first in git_search gitweb: Split body of git_search into subroutines gitweb: Clean up code in git_search_* subroutines gitweb: Make git_search_* subroutines render whole pages gitweb: Refactor git_header_html git-instaweb: Extract configuring web server into configure_httpd git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf git-instaweb: Move all actions at the end of script git-instaweb: Check that correct config file exists for (re)start gitweb: Introduce common system-wide settings for convenience gitweb: Git config keys are case insensitive, make config search too Jeff King (28): t: add tests for cloning remotes with detached HEAD consider only branches in guess_remote_head make copy_ref globally available clone: always fetch remote HEAD limit "contains" traversals based on commit timestamp default core.clockskew variable to one day archive: reorder option parsing and config reading archive-tar: don't reload default config options archive: refactor list of archive formats archive: pass archiver struct to write_archive callback archive: move file extension format-guessing lower archive: refactor file extension format-guessing archive: implement configurable tar filters archive: provide builtin .tar.gz filter upload-archive: allow user to turn off filters parse-options: add OPT_STRING_LIST helper remote: use new OPT_STRING_LIST config: make git_config_parse_parameter a public function clone: accept config options on the command line git skew: a tool to find how big a clock skew exists in the history transport-helper: fix minor leak in push_refs_with_export t5800: factor out some ref tests t5800: document some non-functional parts of remote helpers git-remote-testgit: import non-HEAD refs transport-helper: don't feed bogus refs to export push git_remote_helpers: push all refs during a non-local export streaming: free git_istream upon closing docs: put listed example commands in backticks Jens Lehmann (1): Documentation/submodule: add command references and update options Jim Meyering (1): sha1_file: use the correct type (ssize_t, not size_t) for read-style function Johannes Sixt (7): sh-i18n--envsubst: do not crash when no arguments are given mingw.c: move definition of mingw_getenv down Windows: teach getenv to do a case-sensitive search rebase: do not print lots of usage hints after an obvious error message Make test number unique Skip archive --remote tests on Windows t3900: do not reference numbered arguments from the test script Jon Jensen (1): Add option hooks.diffopts to customize change summary in post-receive-email Jon Seymour (16): bisect: move argument parsing before state modification. bisect: use && to connect statements that are deferred with eval. bisect: add tests to document expected behaviour in presence of broken trees. bisect: introduce support for --no-checkout option. bisect: introduce --no-checkout support into porcelain. bisect: add tests for the --no-checkout option. bisect: add documentation for --no-checkout option. bisect: cleanup whitespace errors in git-bisect.sh. bisect: replace "; then" with "\n*then" misc-sh: fix up whitespace in some other .sh files. gettext: add gettextln, eval_gettextln to encode common idiom git-am: take advantage of gettextln and eval_gettextln. pull: take advantage of eval_gettextln stash: take advantage of eval_gettextln submodule: take advantage of gettextln and eval_gettextln. bisect: add support for bisecting bare repositories Jonathan Nieder (4): test: simplify return value of test_run_ test: cope better with use of return for errors revert: plug memory leak in "cherry-pick root commit" codepath merge-recursive: take advantage of hardcoded empty tree Josh Triplett (5): Fix prefix handling in ref iteration functions ref namespaces: infrastructure ref namespaces: Support remote repositories via upload-pack and receive-pack ref namespaces: documentation ref namespaces: tests Junio C Hamano (52): index-pack: group the delta-base array entries also by type write_idx_file: introduce a struct to hold idx customization options index-pack: --verify write_idx_file: need_large_offset() helper function index-pack --verify: read anomalous offsets from v2 idx file packed_object_info_detail(): do not return a string sha1_object_info_extended(): expose a bit more info sha1_object_info_extended(): hint about objects in delta-base cache unpack_object_header(): make it public write_entry(): separate two helper functions out streaming: a new API to read from the object store streaming_write_entry(): use streaming API in write_entry() convert: CRLF_INPUT is a no-op in the output codepath streaming_write_entry(): support files with holes streaming: read non-delta incrementally from a pack sha1_file.c: expose helpers to read loose objects streaming: read loose objects incrementally checkout: make advice when reattaching the HEAD less loud merge: reword the final message convert.h: move declarations for conversion from cache.h Add streaming filter API stream filter: add "no more input" to the filters Add LF-to-CRLF streaming conversion streaming filter: ident filter streaming: filter cascading t0021: test application of both crlf and ident diff --stat-count: finishing touches index-pack: a miniscule refactor index-pack: start learning to emulate "verify-pack -v" index-pack: show histogram when emulating "verify-pack -v" verify-pack: use index-pack --verify verify_path(): simplify check at the directory boundary git-submodule.sh: clarify the "should we die now" logic Add option to disable NORETURN Start 1.7.7 cycle core: log offset pack data accesses happened pack-objects: optimize "recency order" diff-lib: simplify do_diff_cache() diff-lib: refactor run_diff_index() and do_diff_cache() Revert clock-skew based attempt to optimize tag --contains traversal Update draft release notes to 1.7.7 Update draft release notes to 1.7.7 bisect: further style nitpicks filter-branch.sh: de-dent usage string Update draft release notes to 1.7.7 test: consolidate definition of $LF Sync with "maint" Update draft release notes to 1.7.7 Update draft release notes to 1.7.7 commit: reduce use of redundant global variables Update draft release notes to 1.7.7 Git 1.7.7-rc0 Ludwig Nussel (1): gitweb: allow space as delimiter in mime.types Markus Duft (1): Update the Interix default build configuration. Michael Haggerty (29): doc: Add a link from gitattributes(5) to git-check-attr(1) doc: Correct git_attr() calls in example code Remove anachronism from comment Disallow the empty string as an attribute name git-check-attr: Add missing "&&" git-check-attr: Add tests of command-line parsing Provide access to the name attribute of git_attr git-check-attr: Use git_attr_name() Teach prepare_attr_stack() to figure out dirlen itself Extract a function collect_all_attrs() Remove redundant call to bootstrap_attr_stack() Remove redundant check Allow querying all attributes on a file git-check-attr: Extract a function output_attr() git-check-attr: Introduce a new variable git-check-attr: Extract a function error_with_usage() git-check-attr: Handle each error separately git-check-attr: Process command-line args more systematically git-check-attr: Error out if no pathnames are specified git-check-attr: Add an --all option to show all attributes git-check-attr: Drive two tests using the same raw data git-check-attr: Fix command-line handling to match docs Rename git_checkattr() to git_check_attr() git-check-attr: test that no output is written to stderr git-check-attr: Demonstrate problems with unnormalized paths git-check-attr: Demonstrate problems with relative paths git-check-attr: Normalize paths test-path-utils: Add subcommand "absolute_path" test-path-utils: Add subcommand "prefix_path" Michael J Gruber (3): diff.c: omit hidden entries from namelen calculation with --stat diff: introduce --stat-lines to limit the stat lines diff-options.txt: describe --stat-{width,name-width,count} Pete Wyckoff (4): git-p4: use test_when_finished in tests git-p4: add missing && in test git-p4: one test missing config git-p4.skipSubmitEditCheck git-p4: commit time should be most recent p4 change time Ramsay Allan Jones (3): help.c: Fix detection of custom merge strategy on cygwin t1301-*.sh: Fix the 'forced modes' test on cygwin config.c: Make git_config() work correctly when called recursively René Scharfe (6): t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test grep: fix coloring of hunk marks between files grep: add --break grep: add --heading grep: add option to show whole function as context grep: long context options Roberto Tyley (1): Tolerate zlib deflation with window size < 32Kb Sverre Rabbelier (14): t5800: use skip_all instead of prereq remote-curl: accept empty line as terminator git-remote-testgit: only push for non-local repositories git-remote-testgit: fix error handling fast-import: introduce 'done' command fast-export: support done feature transport-helper: factor out push_update_refs_status transport-helper: check status code of finish_command transport-helper: use the new done feature where possible transport-helper: update ref status after push with export transport-helper: change import semantics transport-helper: Use capname for refspec capability too transport-helper: implement marks location as capability transport-helper: die early on encountering deleted refs Tay Ray Chuan (13): xdiff/xprepare: use memset() xdiff/xprepare: refactor abort cleanups xdiff/xpatience: factor out fall-back-diff function t4033-diff-patience: factor out tests teach --histogram to diff xdiff/xprepare: skip classification xdiff/xprepare: use a smaller sample size for histogram diff xdiff: do away with xdl_mmfile_next() http.c: fix an invalid free() Makefile: some changes for http-related flag documentation xdiff/xhistogram: rework handling of recursed results xdiff/xhistogram: rely on xdl_trim_ends() xdiff/xhistogram: drop need for additional variable Theo Niessink (3): A Windows path starting with a backslash is absolute real_path: do not assume '/' is the path seperator verify_dotfile(): do not assume '/' is the path seperator Thomas Cort (1): Makefile: add Minix configuration options. maximilian attems (2): am: pass exclude down to apply am: Document new --exclude= option Ævar Arnfjörð Bjarmason (48): i18n: git-am add git-sh-i18n i18n: git-am one-line gettext $msg; echo i18n: git-am multi-line getttext $msg; echo i18n: git-am eval_gettext messages i18n: git-am gettext + gettext to stderr message i18n: git-am die messages i18n: git-am cannot_fallback messages i18n: git-am clean_abort messages i18n: git-am "Apply?" message i18n: git-am "Falling back" say message i18n: git-am core say messages i18n: git-am printf(1) message to eval_gettext i18n: git-pull add git-sh-i18n i18n: git-pull die messages i18n: git-pull eval_gettext + die message i18n: git-pull eval_gettext + warning message i18n: git-submodule add git-sh-i18n i18n: git-submodule echo + eval_gettext messages i18n: git-submodule say + eval_gettext messages i18n: git-submodule die + eval_gettext messages i18n: git-submodule $update_module say + die messages i18n: git-submodule "cached cannot be used" message i18n: git-submodule "Submodule change[...]" messages i18n: git-submodule $errmsg messages i18n: git-submodule "Entering [...]" message i18n: git-submodule "[...] path is ignored" message i18n: git-submodule "path not initialized" message i18n: git-submodule "blob" and "submodule" messages i18n: git-stash add git-sh-i18n i18n: git-stash echo + gettext message i18n: git-stash say + gettext messages i18n: git-stash die + gettext messages i18n: git-stash die + eval_gettext messages i18n: git-stash die + eval_gettext $* messages i18n: git-stash die + eval_gettext $1 messages i18n: git-stash "unknown option" message i18n: git-stash drop_stash say/die messages i18n: git-bisect add git-sh-i18n i18n: git-bisect gettext + echo message i18n: git-bisect echo + gettext messages i18n: git-bisect echo + eval_gettext message i18n: git-bisect die + gettext messages i18n: git-bisect die + eval_gettext messages i18n: git-bisect bisect_run + $@ messages i18n: git-bisect bisect_reset + $1 messages i18n: git-bisect bisect_replay + $1 messages i18n: git-bisect [Y/n] messages i18n: git-bisect bisect_next_check "You need to" message 张忠山 (1): gitweb: pass string after encoding in utf-8 to syntax highlighter Version v1.7.6.6; changes since v1.7.6.5: ----------------------------------------- Clemens Buchacher (1): Documentation: read-tree --prefix works with existing subtrees Jack Nagel (1): Add MYMETA.json to perl/.gitignore Jeff King (5): attr: don't confuse prefixes with leading directories attr: drop misguided defensive coding attr: fix leak in free_attr_elem thin-pack: try harder to use preferred base objects as base imap-send: remove dead code Junio C Hamano (6): attr.c: make bootstrap_attr_stack() leave early attr.c: clarify the logic to pop attr_stack Documentation: rerere's rr-cache auto-creation and rerere.enabled Prepare for 1.7.6.6 Update draft release notes to 1.7.6.6 Git 1.7.6.6 Nguyễn Thái Ngọc Duy (1): t2203: fix wrong commit command Thomas Rast (1): Documentation: rerere.enabled is the primary way to configure rerere Version v1.7.6.5; changes since v1.7.6.4: ----------------------------------------- Haitao Li (1): date.c: Support iso8601 timezone formats Jeff King (3): stripspace: fix outdated comment fetch: create status table using strbuf blame: don't overflow time buffer Jim Meyering (1): make the sample pre-commit hook script reject names with newlines, too Jonathon Mah (1): mergetool: Use args as pathspec to unmerged files Junio C Hamano (3): mergetool: no longer need to save standard input name-rev --all: do not even attempt to describe non-commit object Git 1.7.6.5 Marc-André Lureau (1): mailmap: xcalloc mailmap_info Martin von Zweigbergk (4): remote: write correct fetch spec when renaming remote 'remote' remote: "rename o foo" should not rename ref "origin/bar" remote rename: warn when refspec was not updated remote: only update remote-tracking branch if updating refspec Michael Haggerty (1): notes_merge_commit(): do not pass temporary buffer to other function Michael J Gruber (3): unpack-trees: print "Aborting" to stderr git-read-tree.txt: language and typography fixes git-read-tree.txt: correct sparse-checkout and skip-worktree description Nguyễn Thái Ngọc Duy (2): git-read-tree.txt: update sparse checkout examples Reindent closing bracket using tab instead of spaces Peter Stuge (1): gitweb: Fix links to lines in blobs when javascript-actions are enabled Ramsay Allan Jones (1): t9159-*.sh: skip for mergeinfo test for svn <= 1.4 Sebastian Morr (1): Add MYMETA.yml to perl/.gitignore Stefan Naewe (1): Documentation/git-update-index: refer to 'ls-files' Thomas Rast (1): Documentation: basic configuration of notes.rewriteRef Version v1.7.6.4; changes since v1.7.6.3: ----------------------------------------- Allan Caffee (1): describe: Refresh the index when run with --dirty Clemens Buchacher (1): ls-files: fix pathspec display on error Giuseppe Bilotta (1): am: format is in $patch_format, not parse_patch Jay Soffian (1): git-mergetool: check return value from read Johannes Sixt (1): t3005: do not assume a particular order of stdout and stderr of git-ls-files Junio C Hamano (4): read_gitfile_gently(): rename misnamed function to read_gitfile() clone: allow more than one --reference clone: clone from a repository with relative alternates Git 1.7.6.4 Michael Haggerty (2): check-ref-format --print: Normalize refnames that start with slashes Forbid DEL characters in reference names Michael J Gruber (1): branch.c: use the parsed branch name Nguyễn Thái Ngọc Duy (1): clone: allow to clone from .git file Version v1.7.6.3; changes since v1.7.6.2: ----------------------------------------- Dave Zarzycki (1): Do not log unless all connect() attempts fail Jeff King (9): status: fix bug with missing --ignore files tag: speed up --contains calculation strbuf_split: add a max parameter fix "git -c" parsing of values with equals signs config: die on error in command-line config config: avoid segfault when parsing command-line config strbuf: allow strbuf_split to work on non-strbufs config: use strbuf_split_str instead of a temporary strbuf reset: give better reflog messages Jens Lehmann (1): fetch: skip on-demand checking when no submodules are configured Jonathan Nieder (2): Documentation: quote double-dash for AsciiDoc Documentation/i18n: quote double-dash for AsciiDoc Junio C Hamano (4): git status --ignored: tests and docs mergetool: check return value from read Prepare for 1.7.6.3 maintenance release Git 1.7.6.3 Michael Schubert (1): reflog: actually default to subcommand 'show' Sverre Rabbelier (1): SubmittingPathces: remove Cogito reference Vitaliy Ivanov (1): tests: cleanup binary test vector files Version v1.7.6.2; changes since v1.7.6.1: ----------------------------------------- Junio C Hamano (3): whitespace: have SP on both sides of an assignment "=" Revert "Merge branch 'cb/maint-quiet-push' into maint" Git 1.7.6.2 Pang Yan Han (1): update-ref: whitespace fix Thomas Rast (1): Documentation: clarify effects of -- arguments Version v1.7.6.1; changes since v1.7.6: --------------------------------------- Alex Neronskiy (2): Fix documentation of fetch-pack that implies that the client can disconnect after sending wants. Document the underlying protocol used by shallow repositories and --depth commands. Andrew Wong (1): rebase -i -p: include non-first-parent commits in todo list Bert Wesarg (1): Documentation: clearly specify what refs are honored by core.logAllRefUpdates Brandon Casey (2): t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin git-submodule.sh: preserve stdin for the command spawned by foreach Brian Harring (1): get_indexed_object can return NULL if nothing is in that slot; check for it Carlos Martín Nieto (1): Documentation: clarify the invalidated tree entry format Clemens Buchacher (3): error_routine: use parent's stderr if exec fails propagate --quiet to send-pack/receive-pack notice error exit from pager Dmitry Ivankov (1): doc/fast-import: clarify notemodify command Emilio G. Cota (2): Documentation: ignore *.pdf files Documentation/Makefile: add *.pdf to `clean' target Erik Faye-Lund (1): connect: correctly number ipv6 network adapter Fredrik Kuivinen (1): Makefile: Track changes to LDFLAGS and relink when necessary Heiko Voigt (2): add gitignore entry to description about how to write a builtin add technical documentation about ref iteration Jack Nagel (1): Documentation: minor grammatical fix in rev-list-options.txt Jakub Narębski (2): gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss Jeff King (10): combine-diff: split header printing into its own function combine-diff: calculate mode_differs earlier combine-diff: handle binary files as binary refactor get_textconv to not require diff_filespec combine-diff: respect textconv attributes tag: accept multiple patterns for --list docs: document --textconv diff option t7400: fix bogus test failure with symlinked trash fast-export: quote paths in output am: refresh the index at start and --resolved Jens Lehmann (7): submodule add: test failure when url is not configured in superproject submodule add: allow relative repository path even when no url is set submodule add: clean up duplicated code fetch: Also fetch submodules in subdirectories in on-demand mode submodule add: always initialize .git/config entry tests: print failed test numbers at the end of the test run submodule: update and add must honor --quiet flag Johannes Schindelin (1): get_pwd_cwd(): Do not trust st_dev/st_ino blindly Jon Seymour (2): Add a test to check that git ls-tree sets non-zero exit code on error. Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. Julian Phillips (1): remote-curl: Add a format check to parsing of info/refs Junio C Hamano (29): diff-index --quiet: learn the "stop feeding the backend early" logic checkout -b : correctly detect existing branch sha1_file.c: "legacy" is really the current format zlib wrapper: refactor error message formatter zlib: wrap remaining calls to direct inflate/inflateEnd zlib: wrap inflateInit2 used to accept only for gzip format zlib: wrap deflate side of the API zlib: wrap deflateBound() too zlib: zlib can only process 4GB at a time zlib: allow feeding more than 4GB in one go t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met cygwin: trust executable bit by default git-remote.txt: avoid sounding as if loose refs are the only ones in the world check-ref-format doc: de-emphasize the implementation detail of a ref git.txt: de-emphasize the implementation detail of a ref glossary: update description of "tag" glossary: update description of head and ref glossary: clarify description of HEAD submodule sync: do not auto-vivify uninteresting submodule "branch -d" can remove more than one branches test: skip clean-up when running under --immediate mode checkout: do not write bogus reflog entry out reset [] paths...: do not mishandle unmerged paths diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" receive-pack: do not overstep command line argument array helping smart-http/stateless-rpc fetch race Prepare for 1.7.6.1 Update draft release notes for 1.7.6.1 Git 1.7.6.1 Martin von Zweigbergk (2): Documentation: use [verse] for SYNOPSIS sections rebase: clarify "restore the original branch" Michael Haggerty (6): git-svn: Demonstrate a bug with root commits in mergeinfo ranges git-svn: Disambiguate rev-list arguments to improve error message git-svn: Correctly handle root commits in mergeinfo ranges gitattributes: Clarify discussion of attribute macros gitattributes: Reword "attribute macro" to "macro attribute" Do not use C++-style comments Michael Schubert (1): help_unknown_cmd: do not propose an "unknown" cmd Michael Witten (1): filter-branch: Export variable `workdir' for --commit-filter Namhyung Kim (1): git-remote.txt: fix wrong remote refspec Nguyễn Thái Ngọc Duy (3): Break down no-lstat() condition checks in verify_uptodate() checkout-index: remove obsolete comment fetch-pack: check for valid commit from server Ori Avtalion (1): pull: remove extra space from reflog message Pavan Kumar Sunkara (1): git-config: Remove extra whitespaces Peter Collingbourne (1): Documentation: git-filter-branch honors replacement refs Version v1.7.6; changes since v1.7.6-rc3: ----------------------------------------- Junio C Hamano (1): Git 1.7.6 Namhyung Kim (1): completion: replace core.abbrevguard to core.abbrev Version v1.7.6-rc3; changes since v1.7.6-rc2: --------------------------------------------- Andreas Schwab (1): builtin/gc.c: add missing newline in message Brandon Casey (1): sh-i18n--envsubst.c: do not #include getopt.h Christof Krüger (1): Documentation: git diff --check respects core.whitespace Dmitry Ivankov (1): Fix typo: existant->existent Jakub Narębski (1): gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled Jeff King (2): t/Makefile: pass test opts to valgrind target properly tests: link shell libraries into valgrind directory Jim Meyering (1): plug a few coverity-spotted leaks Junio C Hamano (2): t7810: avoid unportable use of "echo" Git 1.7.6-rc3 Version v1.7.6-rc2; changes since v1.7.6-rc1: --------------------------------------------- Jonathan Nieder (1): gitweb: do not misparse nonnumeric content tag files that contain a digit Junio C Hamano (1): Git 1.7.6-rc2 Version v1.7.6-rc1; changes since v1.7.6-rc0: --------------------------------------------- Alex Riesen (1): t3703: skip more tests using colons in file names on Windows Brandon Casey (2): t7508: demonstrate status's failure to use --porcelain format with -z builtin/commit.c: set status_format _after_ option parsing Jakub Narębski (4): gitweb: Move information about installation from README to INSTALL gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL gitweb: Move "Requirements" up in gitweb/INSTALL gitweb: Fix usability of $prevent_xss Jeff King (1): diff_tree: disable QUICK optimization with diff filter Jim Meyering (1): fetch: do not leak a refspec Junio C Hamano (2): diff: futureproof "stop feeding the backend early" logic Git 1.7.6-rc1 Version v1.7.6-rc0; changes since v1.7.5.4: ------------------------------------------- Boris Faure (1): Do not strip empty lines / trailing spaces from a commit message template Carlos Martín Nieto (1): log: convert to parse-options Conrad Irwin (5): Use a temporary index for git commit --interactive Allow git commit --interactive with paths Add support for -p/--patch to git-commit Add commit to list of config.singlekey commands Test atomic git-commit --interactive Csaba Henk (1): rebase: create HEAD reflog entry when aborting Dan McGee (4): Share color list between graph and show-branch http: make curl callbacks match contracts from curl header http-push: use const for strings in signatures http-push: refactor curl_easy_setup madness Elijah Newren (3): t6022: New test checking for unnecessary updates of renamed+modified files t6022: New test checking for unnecessary updates of files in D/F conflicts merge-recursive: When we detect we can skip an update, actually skip it Erik Faye-Lund (2): strbuf: make sure buffer is zero-terminated config: support values longer than 1023 bytes Heiko Voigt (1): test that git status works with merge conflict in, .gitmodules Ingo Molnar (1): hashcmp(): inline memcmp() by hand to optimize Jakub Narębski (13): gitweb: Restructure projects list generation gitweb: Change the way "content tags" ('ctags') are handled gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo) gitweb: Split JavaScript for maintability, combining on build gitweb.js: Update and improve comments in JavaScript files gitweb.js: Provide default values for padding in padLeftStr and padLeft gitweb.js: Extract and improve datetime handling gitweb.js: Introduce code to handle cookies from JavaScript gitweb.js: Provide getElementsByClassName method (if it not exists) gitweb: Refactor generating of long dates into format_timestamp_html gitweb: Unify the way long timestamp is displayed gitweb: Make JavaScript ability to adjust timezones configurable gitweb: Refactor reading and parsing config file into read_config_file Jay Soffian (2): "git log -h": typofix misspelled 'suppress' Add log.abbrevCommit config variable Jeff King (26): notes: make expand_notes_ref globally accessible revision.c: refactor notes ref expansion notes: refactor display notes extra refs field notes: refactor display notes default handling revision.c: support --notes command-line option revision.c: make --no-notes reset --notes list format-patch: wrap email addresses after long names add tests for various blame formats blame: refactor porcelain output blame: add --line-porcelain output format t7501.8: feed a meaningful command fetch: avoid repeated commits in mark_complete Makefile: sort TEST_PROGRAMS list refactor refs_from_alternate_cb to allow passing extra data bisect: refactor sha1_array into a generic sha1 list receive-pack: eliminate duplicate .have refs doc: discuss textconv versus external diff drivers remote: allow "-t" with fetch mirrors read_in_full: always report errors t: test subject handling in format-patch / am pipeline mailinfo: always clean up rfc822 header folding pretty: add pp_commit_easy function for simple callers clean up calling conventions for pretty.c functions format-patch: preserve subject newlines with -k rebase: write a reflog entry when finishing format-patch: make zero-length subject prefixes prettier Jens Lehmann (3): Submodules: Don't parse .gitmodules when it contains, merge conflicts unpack-trees: add the dry_run flag to unpack_trees_options Teach read-tree the -n|--dry-run option Jim Meyering (2): diffcore-rename.c: avoid set-but-not-used warning plug a DIR buffer leak in rerere.c Johan Herland (10): log/pretty-options: Document --[no-]notes and deprecate old notes options Make "git notes add" more user-friendly when there are existing notes Add several testcases for --dirstat and friends Make --dirstat=0 output directories that contribute < 0.1% of changes Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file Add config variable for specifying default --dirstat behavior Allow specifying --dirstat cut-off percentage as a floating point number New --dirstat=lines mode, doing dirstat analysis based on diffstat Improve error handling when parsing dirstat parameters Mark dirstat error messages for translation Johannes Sixt (3): t3703: Skip tests using directory name ":" on Windows Tweak t3102-ls-tree-wildcards to run on Windows Windows: add a wrapper for the shutdown() system call John 'Warthog9' Hawley (2): gitweb: JavaScript ability to adjust time based on timezone gitweb.js: Add UI for selecting common timezone to display dates Jon Seymour (1): git: add --info-path and --man-path options Jonathan Nieder (15): revisions: split out handle_revision_pseudo_opt function revisions: allow --glob and friends in parse_options-enabled commands Documentation: clarify meaning of --html-path, --man-path, and --info-path tests: eliminate unnecessary setup test assertions tests: teach verify_parents to check for extra parents tests: check git does not barf on merge.ff values for future versions of git completion: move private shopt shim for zsh to __git_ namespace t4018 (funcname patterns): make .gitattributes state easier to track t4018 (funcname patterns): make configuration easier to track t4018 (funcname patterns): minor cleanups userdiff/perl: anchor "sub" and "package" patterns on the left userdiff/perl: match full line of POD headers userdiff/perl: catch sub with brace on second line tests: make test_expect_code quieter on success userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters Junio C Hamano (53): merge-recursive: tweak magic band-aid git diff -D: omit the preimage of deletes pathspec: rename per-item field has_wildcard to use_wildcard magic pathspec: add tentative ":/path/from/top/level" pathspec support merge: allow "-" as a short-hand for "previous branch" magic pathspec: futureproof shorthand form magic pathspec: add ":(icase)path" to match case insensitively Start 1.7.6 cycle Update draft release notes to 1.7.6 Update draft release notes to 1.7.6 Update draft release notes to 1.7.6 Update draft release notes to 1.7.6 merge: introduce merge.ff configuration variable rerere: libify rerere_clear() and rerere_gc() index_fd(): turn write_object and format_check arguments into one flag index_fd(): split into two helper functions convert: rename the "eol" global variable to "core_eol" convert: give saner names to crlf/eol variables, types and functions convert: make it safer to add conversion attributes convert: make it harder to screw up adding a conversion attribute git-grep: do not die upon -F/-P when grep.extendedRegexp is set. Revert "magic pathspec: add ":(icase)path" to match case insensitively" pathspec: drop "lone : means no pathspec" from get_pathspec() grep: use get_pathspec() correctly fix overstrict : diagnosis fix overslow :/no-such-string-ever-existed diagnostics rev/path disambiguation: further restrict "misspelled index entry" diag Revert "completion: don't declare 'local words' to make zsh happy" Update draft release notes to 1.7.6 revision.c: leave a note for "a lone :" enhancement Update draft release notes to 1.7.6 Bigfile: teach "git add" to send a large file straight to a pack Declare lookup_replace_object() in cache.h, not in commit.h t6050: make sure we test not just commit replacement read_sha1_file(): get rid of read_sha1_file_repl() madness inline lookup_replace_object() calls read_sha1_file(): allow selective bypassing of replacement mechanism Sync release notes for 1.7.6 to exclude what are in maintenance track git-grep: update tests now regexp type is "last one wins" Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS Update release notes to 1.7.6 notes remove: allow removing more than one notes remove: --ignore-missing notes remove: --stdin reads from the standard input show: --ignore-missing Revert "Merge branch 'en/merge-recursive'" Update draft release notes to 1.7.6 Update 1.7.6 draft release notes require-work-tree wants more than what its name says compat/fnmatch/fnmatch.c: give a fall-back definition for NULL Update 1.7.6 draft release notes log: --quiet should serve as synonym to -s Update draft release notes to 1.7.6 Luke Diamand (3): git-p4: add option to preserve user names git-p4: small improvements to user-preservation git-p4: warn if git authorship won't be retained Marius Storm-Olsen (1): Automatically autoload bashcompinit for ZSH, when needed Martin von Zweigbergk (34): rebase: clearer names for directory variables rebase: refactor reading of state rebase: read state outside loop rebase: remove unused rebase state 'prev_head' rebase: improve detection of rebase in progress rebase: act on command line outside parsing loop rebase: stricter check of standalone sub command rebase: align variable names rebase: align variable content rebase: factor out command line option processing rebase -i: remove now unnecessary directory checks rebase: reorder validation steps rebase: factor out reference parsing rebase: factor out clean work tree check rebase: factor out call to pre-rebase hook rebase -i: support --stat rebase: remove $branch as synonym for $orig_head rebase: extract merge code to new source file rebase: extract am code to new source file rebase: show consistent conflict resolution hint rebase -i: align variable names rebase: make -v a tiny bit more verbose rebase: factor out sub command handling rebase: extract code for writing basic state rebase: remember verbose option rebase: remember strategy and strategy options rebase -m: remember allow_rerere_autoupdate option rebase -m: don't print exit code 2 when merge fails git-rebase--am: remove unnecessary --3way option rebase -i: don't read unused variable preserve_merges rebase -i: remove unnecessary state rebase-root rebase: use @{upstream} if no upstream specified Makefile: do not install sourced rebase scripts rebase: define options in OPTIONS_SPEC Mathias Lafeldt (1): t/test-lib.sh: minor readability improvements Michael Haggerty (1): git-svn: add an option to skip the creation of empty directories Michael J Gruber (7): contrib/completion: --notes, --no-notes rev-list --count: separate count for --cherry-mark t1020: test !alias in subdirectory handle_alias: provide GIT_PREFIX to !alias config: define and document exit codes config: Give error message when not changing a multivar sh-18n: quell "unused variable" warning Michael Schubert (2): tag: disallow '-' as tag name ls-remote: the --exit-code option reports "no matching refs" Michał Kiedrowicz (11): Documentation: Add --line-number to git-grep synopsis contrib/completion: --line-number to git grep grep: Put calls to fixmatch() and regmatch() into patmatch() grep: Fix a typo in a comment grep: Extract compile_regexp_failed() from compile_regexp() git-grep: Learn PCRE configure: Check for libpcre grep: Add basic tests git-grep: Bail out when -P is used with -F or -E git-grep: Update tests (mainly for -P) git-grep: Fix problems with recently added tests Namhyung Kim (1): blame: add --abbrev command line option and make it honor core.abbrev Nguyễn Thái Ngọc Duy (8): Reimplement read_tree_recursive() using tree_entry_interesting() Convert read_tree{,_recursive} to support struct pathspec Improve tree_entry_interesting() handling code setup: return correct prefix if worktree is '/' Kill off get_relative_cwd() t1011: fix sparse-checkout initialization and add new file sparse checkout: do not eagerly decide the fate for whole directory t3703, t4208: add test cases for magic pathspec Nicolas Morey-Chaisemartin (1): submodule: Add --force option for git submodule update Rafael Gieschke (1): ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd Ramsay Allan Jones (9): Makefile: Use cgcc rather than sparse in the check target sparse: Fix an "symbol 'cmd_index_pack' not declared" warning sparse: Fix some "Using plain integer as NULL pointer" warnings sparse: Fix an "symbol 'format_subject' not declared" warning sparse: Fix an "symbol 'merge_file' not decared" warning sparse: Fix errors due to missing target-specific variables sparse: Fix some "symbol not declared" warnings setup.c: Fix some "symbol not declared" sparse warnings config.c: Remove unused git_config_global() function René Scharfe (1): strbuf: clarify assertion in strbuf_setlen() SZEDER Gábor (3): completion: don't modify the $cur variable in completion functions completion: remove unnecessary _get_comp_words_by_ref() invocations completion: don't declare 'local words' to make zsh happy Sebastien Cevey (3): gitweb: Split git_project_list_body in two functions gitweb: Modularized git_get_project_description to be more generic gitweb: Optional grouping of projects by category Tay Ray Chuan (1): t5541-http-push: add test for chunked Ævar Arnfjörð Bjarmason (5): git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers git-sh-i18n.sh: add GIT_GETTEXT_POISON support Makefile: add xgettext target for *.sh files git-sh-i18n--envsubst: add SYNOPSIS section to the documentation Version v1.7.5.4; changes since v1.7.5.3: ----------------------------------------- Brandon Casey (2): Documentation/technical/api-diff.txt: correct name of diff_unmerge() git-submodule.sh: separate parens by a space to avoid confusing some shells Jeff King (8): config: make environment parsing routines static git_config: don't peek at global config_parameters config: always parse GIT_CONFIG_PARAMETERS during git_config read_gitfile_gently: use ssize_t to hold read result docs: minor grammar fixes to git-status docs: update status --porcelain format docs: make sure literal "->" isn't converted to arrow docs: fix some antique example output Jim Meyering (3): rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' remove tests of always-false condition diffcore-rename.c: avoid set-but-not-used warning Jonathan Nieder (3): tests: check error message from run_command run-command: handle short writes and EINTR in die_child Documentation: do not misinterpret refspecs as bold text Junio C Hamano (26): builtin/diff.c: remove duplicated call to diff_result_code() diffcore-rename: refactor "too many candidates" logic diffcore-rename: record filepair for rename src diffcore-rename: fall back to -C when -C -C busts the rename limit i18n: do not overuse C_LOCALE_OUTPUT i18n: .git file is not a human readable message (t5601) i18n: use test_i18ncmp in t1200 and t2200 i18n: do not overuse C_LOCALE_OUTPUT (grep) i18n: use test_i18ngrep in lib-httpd and t2019 i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 i18n: use test_i18ngrep in t7201 i18n: use test_i18ncmp in t7500 i18n: use test_i18ngrep in t7501 i18n: use test_i18ngrep and test_i18ncmp in t7502 i18n: use test_i18ngrep in t7506 i18n: use test_i18n{grep,cmp} in t7508 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 handle_options(): do not miscount how many arguments were used userformat_find_requirements(): find requirement for the correct format config.mak.in: allow "configure --sysconfdir=/else/where" Start 1.7.5.4 draft release notes Git 1.7.5.4 Mathias Lafeldt (1): t/README: unify documentation of test function args Ramkumar Ramachandra (4): Documentation: Add filter..* to config Documentation: Move diff..* from config.txt to diff-config.txt Documentation: Add diff..* to config Documentation: Allow custom diff tools to be specified in 'diff.tool' Thomas Rast (1): add -i: ignore terminal escape sequences Valentin Haenel (5): config.txt: 'interactive.singlekey; is used by... git-add.txt: document 'interactive.singlekey' git-stash.txt: better docs for '--patch' git-checkout.txt: better docs for '--patch' git-reset.txt: better docs for '--patch' Ævar Arnfjörð Bjarmason (7): i18n: mark merge "Could not read from" message for translation i18n: mark merge "upstream" messages for translation i18n: mark merge CHERRY_PICK_HEAD messages for translation i18n: mark clone nonexistent repository message for translation i18n: mark checkout --detach messages for translation i18n: mark checkout plural warning for translation i18n: mark init-db messages for translation Version v1.7.5.3; changes since v1.7.5.2: ----------------------------------------- Felipe Contreras (1): git-completion: fix regression in zsh support Fraser Tweedale (1): gitweb: supply '-n' to gzip for identical output Jeff King (8): send-pack: unbreak push over stateless rpc cherry-pick: handle root commits with external strategies revert: allow reverting a root commit t3503: test cherry picking and reverting root commits connect: treat generic proxy processes like ssh processes connect: let callers know if connection is a socket send-pack: avoid deadlock on git:// push with failed pack-objects test core.gitproxy configuration Jim Meyering (1): do not read beyond end of malloc'd buffer Johannes Sixt (3): Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird send-pack: avoid deadlock when pack-object dies early Honor $(prefix) set in config.mak* when defining ETC_GIT* Jonathan Nieder (5): Revert "t0081 (line-buffer): add buffering tests" Documentation: explain how to check for patch corruption Documentation: hints for sending patches inline with Thunderbird Documentation: publicize KMail hints for sending patches inline Documentation: publicize hints for sending patches with GMail Junio C Hamano (4): Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" setup_revisions(): take pathspec from command line and --stdin correctly sideband_demux(): fix decl-after-stmt Git 1.7.5.3 Kacper Kornet (1): Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir Michael J Gruber (2): config.txt,diff-options.txt: porcelain vs. plumbing for color.diff git-svn: Fix git svn log --show-commit Nguyễn Thái Ngọc Duy (1): init/clone: remove short option -L and document --separate-git-dir Rafael Gieschke (1): copy_gecos: fix not adding nlen to len when processing "&" Stefan Sperling (1): remove noise and inaccuracies from git-svn docs Version v1.7.5.2; changes since v1.7.5.1: ----------------------------------------- Andrew Wong (1): git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff Brian Gernhardt (1): t/annotate-tests: Use echo & cat instead of sed Carlos Martín Nieto (2): format-patch: don't pass on the --quiet flag format-patch: document --quiet option Ciaran Jessup (1): Pass empty file to p4merge where no base is suitable. Dima Sharov (1): shell: add missing initialization of argv0_path Guy Rouillier (1): Look for password in both CVS and CVSNT password files. Jakub Narębski (2): git-instaweb: Simplify build dependency on gitweb Remove gitweb/gitweb.cgi and other legacy targets from main Makefile Jeff King (3): pretty: quote rfc822 specials in email addresses add tests for merge-index / merge-one-file merge-one-file: fix broken merges with alternate work trees Jim Meyering (1): Documentation/git-fsck.txt: fix typo: unreadable -> unreachable Johan Herland (1): t5400: Fix a couple of typos Jonathan Nieder (4): Restructure documentation for git-merge-base. Documentation: describe the format of messages with inline patches add, merge, diff: do not use strcasecmp to compare config variable names provide a copy of the LGPLv2.1 Jonathon Mah (1): mergetool: Teach about submodules Josh Stone (1): blame: tolerate bogus e-mail addresses a bit better João Britto (1): Remove duplicated "is a" Junio C Hamano (19): test: use $_z40 from test-lib diff.c: return filepair from diff_unmerge() diff: remove often unused parameters from diff_unmerge() diff-files: show unmerged entries correctly Fix "add -u" that sometimes fails to resolve unmerged paths add -p: 'q' should really quit t3701: Editing a split hunk in an "add -p" session add--interactive.perl: factor out repeated --recount option "add -p": work-around an old laziness that does not coalesce hunks t3701: fix here document merge: make branch..mergeoptions correctly override merge.