Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'ff/c99' into next * ff/c99: Remove all void-pointer arithmetic.
Junio C Hamano
Merge branch 'jc/upload-corrupt' into next * jc/upload-corrupt: upload-pack/fetch-pack: support side-band communication Retire git-clone-pack upload-pack: prepare for sideband message support. upload-pack: avoid sending an incomplete pack upon failure Fix possible out-of-bounds array access
Junio C Hamano
upload-pack/fetch-pack: support side-band communication This implements a protocol extension between fetch-pack and upload-pack to allow stderr stream from upload-pack (primarily used for the progress bar display) to be passed back. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Retire git-clone-pack The program is not used by git-clone since git-fetch-pack was extended to allow its caller do what git-clone-pack alone did, and git-clone was updated to use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
upload-pack: prepare for sideband message support. This does not implement sideband for propagating the status to the downloader yet, but add code to capture the standard error output from the pack-objects process in preparation for sending it off to the client when the protocol extension allows us to do so. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
upload-pack: avoid sending an incomplete pack upon failure When the repository on the remote side is corrupted, rev-list spawned from upload-pack would die with error, but pack-objects that reads from the rev-list happily created a packfile that can be unpacked by the downloader. When this happens, the resulting packfile is not corrupted and unpacks cleanly, but the list of the objects contained in it is not what the protocol exchange computed. This upd…
Junio C Hamano
Merge branch 'jn/web' into next * jn/web: Move $gitbin earlier in gitweb.cgi Add git version to gitweb output gitweb: whitespace cleanup
Uwe Zeisberger
Fix possible out-of-bounds array access If match is "", match[-1] is accessed. Let pathspec_matches return 1 in that case indicating that "" matches everything. Incidently this fixes git-grep'ing in ".". Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narębski
Move $gitbin earlier in gitweb.cgi (cherry picked from 9dca843086356b964f27d8fabe1e3c48074a9f02 commit) Signed-off-by: Jakub Narebski <jnareb.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narębski
Add git version to gitweb output Add git-core binaries used version as the comment at the beginning of HTML output, just below the comment with version of git web interface version. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narębski
gitweb: whitespace cleanup Do not use tabs to align variable initialization (actually use tabs only at the beginning of line, for code indent). Remove trailing whitespace. Make whitespace usage more consistent. Signed-off-by: Jakub Narebski <jnareb.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'master' into next * master: checkout -f: do not leave untracked working tree files. Log peer address when git-daemon called from inetd
Junio C Hamano
checkout -f: do not leave untracked working tree files. Earlier we did not consider untracked working tree files "precious", but we have always considered them fair game to clobber. These days, branch switching by read-tree is more careful and tries to protect untracked working tree files. This caused the following workflow to stop working: git checkout one-branch-with-file-F git checkout -f another-without-file-F git pull . one-branch-with-file-…
David Woodhouse
Log peer address when git-daemon called from inetd When we run git-daemon from inetd, even with the --verbose option, it doesn't log the peer address. That logic was only in the standalone daemon code -- move it to the execute() function instead. Tested with both IPv6 and Legacy IP clients, in both inetd and daemon mode. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio…
Junio C Hamano
Merge branch 'jn/web' into next * jn/web: gitweb: style done with stylesheet gitweb: A couple of page title tweaking
Jakub Narębski
gitweb: style done with stylesheet Replace (almost) all 'style' attributes with 'class' attribute and adding rule to CSS file. Some tables use CSS for styling instead of legacy styling attributes. [jc: too many rejects -- hand fixed and reindented]
Jakub Narębski
gitweb: A couple of page title tweaking [jc: the e-mailed patch did not apply, so I had to guess but I think I got the result right.]
Junio C Hamano
Merge branch 'jn/web' into next
Jakub Narębski
Fix: Support for the standard mime.types map in gitweb Temporary fix: commented out offending line in mimetype_guess. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'master' into next
Junio C Hamano
Merge branch 'jn/web' into next
Junio C Hamano
Merge branch 'pb/config' into next
Florian Forster
Remove all void-pointer arithmetic. ANSI C99 doesn't allow void-pointer arithmetic. This patch fixes this in various ways. Usually the strategy that required the least changes was used. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
git-svn: fix --rmdir when using SVN:: libraries When tracking directories with nearly all of its files at the most nested levels, --rmdir would accidentally go too far when deleting. Of course, we'll add a test for this condition, too. Makefile: automatically run new tests as they appear in t/ Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
git_config: access() returns 0 on success, not > 0 Another late-night bug. Sorry again. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
repo-config: Fix late-night bug This bug was hidden by the "future-proofing" of the test. Sigh. When neither GIT_CONFIG nor GIT_CONFIG_LOCAL is set, do not use NULL, but $GIT_DIR/config. Instead of using $GIT_DIR/config when only GIT_CONFIG_LOCAL is set. Sorry. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narębski
gitweb: add type="text/css" to stylesheet link Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/waitpid' into next * jc/waitpid: Restore SIGCHLD to SIG_DFL where we care about waitpid().
Junio C Hamano
Merge branch 'lt/objlist' into next * lt/objlist: Add "named object array" concept xdiff: minor changes to match libxdiff-0.21 fix rfc2047 formatter. Fix t8001-annotate and t8002-blame for ActiveState Perl Add specialized object allocator
Junio C Hamano
Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next * js/lsfix: Initialize lock_file struct to all zero. * pb/config: Read configuration also from $HOME/.gitconfig Fix setting config variables with an alternative GIT_CONFIG * jn/web: Make CSS file gitweb/gitweb.css more readable
  1. Prev
  2. Next