1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Git 1.7.6-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc3
Junio C Hamano
Merge branch 'maint' * maint: Documentation: git diff --check respects core.whitespace
Christof Krüger
Documentation: git diff --check respects core.whitespace Fix documentation on "git diff --check" by adopting the description from "git apply --whitespace". Signed-off-by: Christof Krüger <git@christof-krueger.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
Jakub Narębski
gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled Both 'pickaxe' (searching changes) and 'grep' (searching files) require basic 'search' feature to be enabled to work. Enabling e.g. only 'pickaxe' won't work. Add a comment about this. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mk/grep-pcre' * mk/grep-pcre: t7810: avoid unportable use of "echo"
Junio C Hamano
t7810: avoid unportable use of "echo" Michael J Gruber noticed that under /bin/dash this test failed (as is expected -- \n in the string can be interpreted by the command), while it passed with bash. We probably could work it around by using backquote in front of it, but it is safer and more readable to avoid "echo" altogether in a case like this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering
plug a few coverity-spotted leaks Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'di/no-no-existant' * di/no-no-existant: Fix typo: existant->existent
Junio C Hamano
Merge branch 'maint' * maint: builtin/gc.c: add missing newline in message
Andreas Schwab
builtin/gc.c: add missing newline in message Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
tests: link shell libraries into valgrind directory When we run tests under valgrind, we symlink anything executable that starts with git-* or test-* into a special valgrind bin directory, and then make that our GIT_EXEC_PATH. However, shell libraries like git-sh-setup do not have the executable bit marked, and did not get symlinked. This means that any test looking for shell libraries in our exec-path would fail to find them, even though that is…
Jeff King
t/Makefile: pass test opts to valgrind target properly The valgrind target just reinvokes make with GIT_TEST_OPTS set to "--valgrind". However, it does this using an environment variable, which means GIT_TEST_OPTS in your config.mak would override it, and "make valgrind" would simply run the test suite without valgrind on. Instead, we should pass GIT_TEST_OPTS on the command-line, overriding what's in config.mak, and take care to append to whatever t…
Junio C Hamano
Merge branch 'ab/i18n-scripts-basic' * ab/i18n-scripts-basic: sh-i18n--envsubst.c: do not #include getopt.h
Brandon Casey
sh-i18n--envsubst.c: do not #include getopt.h The getopt.h header file is not used. It's inclusion is left over from the original version of this source. Additionally, getopt.h does not exist on all platforms (SunOS 5.7) and will cause a compilation failure. So, let's remove it. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dmitry Ivankov
Fix typo: existant->existent refs.c had a error message "Trying to write ref with nonexistant object". And no tests relied on the wrong spelling. Also typo was present in some test scripts internals, these tests still pass. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.6-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc2
Jonathan Nieder
gitweb: do not misparse nonnumeric content tag files that contain a digit v1.7.6-rc0~27^2~4 (gitweb: Change the way "content tags" ('ctags') are handled, 2011-04-29) tried to make gitweb's tag cloud feature more intuitive for webmasters by checking whether the ctags/<label> under a project's .git dir contains a number (representing the strength of association to <label>) before treating it as one. With that change, after putting '$feature{'ctags'}{'default'} = [1];' in…
Junio C Hamano
Git 1.7.6-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc1
Junio C Hamano
Merge branch 'maint' * maint: fetch: do not leak a refspec
Jim Meyering
fetch: do not leak a refspec Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/magic-pathspec' * jc/magic-pathspec: t3703: skip more tests using colons in file names on Windows
Alex Riesen
t3703: skip more tests using colons in file names on Windows Use the same test and prerequisite as introduced in similar fix in 650af7ae8bdf92bd92df2. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/mime-type-with-params' * jn/mime-type-with-params: gitweb: Fix usability of $prevent_xss
Junio C Hamano
Merge branch 'jn/gitweb-docs' * jn/gitweb-docs: gitweb: Move "Requirements" up in gitweb/INSTALL gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL gitweb: Move information about installation from README to INSTALL
Junio C Hamano
Merge branch 'jk/diff-not-so-quick' * jk/diff-not-so-quick: diff: futureproof "stop feeding the backend early" logic diff_tree: disable QUICK optimization with diff filter Conflicts: diff.c
Junio C Hamano
Merge branch 'bc/maint-status-z-to-use-porcelain' * bc/maint-status-z-to-use-porcelain: builtin/commit.c: set status_format _after_ option parsing t7508: demonstrate status's failure to use --porcelain format with -z Conflicts: builtin/commit.c
Jakub Narębski
gitweb: Fix usability of $prevent_xss With XSS prevention on (enabled using $prevent_xss), blobs ('blob_plain') of all types except a few known safe ones are served with "Content-Disposition: attachment". However the check was too strict; it didn't take into account optional parameter attributes, media-type = type "/" subtype *( ";" parameter ) as described in RFC 2616 http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html…
Jakub Narębski
gitweb: Move "Requirements" up in gitweb/INSTALL This way you can examine prerequisites at first glance, before detailed instructions on installing gitweb. Straightforward text movement. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narębski
gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL The build-time configuration variables JSMIN and CSSMIN were mentioned only in Makefile; add their description to gitweb/INSTALL. This required moving description of GITWEB_JS up, near GITWEB_CSS and just introduced CSMIN and JSMIN. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next