1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Merge branch 'maint' * maint: Fix spelling error in post-receive-email hook
Richard Fearn
Fix spelling error in post-receive-email hook Signed-off-by: Richard Fearn <richardfearn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: gitweb.cgi: fix "comitter_tz" typo in feed
Jeff King
http: fix segfault in handle_curl_result When we create an http active_request_slot, we can set its "results" pointer back to local storage. The http code will fill in the details of how the request went, and we can access those details even after the slot has been cleaned up. Commit 8809703 (http: factor out http error code handling) switched us from accessing our local results struct directly to accessing it via the "results" pointer …
Dylan Alex Simon
gitweb.cgi: fix "comitter_tz" typo in feed gitweb's feeds sometimes contained committer timestamps in the wrong timezone due to a misspelling. Signed-off-by: Dylan Simon <dylan@dylex.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.8.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0-rc2
Junio C Hamano
Merge branch 'rr/git-uri-doc' * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
Junio C Hamano
Merge branch 'bw/cp-a-is-gnuism' * bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism
Junio C Hamano
Merge branch 'nd/doc-ignore' * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
Junio C Hamano
Merge branch 'jc/doc-long-options' * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
Junio C Hamano
Sync with maint * maint: attr: a note about the order of .gitattributes lookup
Junio C Hamano
Merge git://bogomips.org/git-svn * git://bogomips.org/git-svn: svn test: escape peg revision separator using empty peg rev git svn: work around SVN 1.7 mishandling of svn:special changes
Jonathan Nieder
svn test: escape peg revision separator using empty peg rev This test script uses "svn cp" to create a branch with an @-sign in its name: svn cp "pr ject/trunk" "pr ject/branches/not-a@{0}reflog" That sets up for later tests that fetch the branch and check that git svn mangles the refname appropriately. Unfortunately, modern svn versions interpret path arguments with an @-sign as an example of path@revision syntax (which pegs a path to a particular rev…
Jonathan Nieder
git svn: work around SVN 1.7 mishandling of svn:special changes Subversion represents symlinks as ordinary files with content starting with "link " and the svn:special property set to "*". Thus a file can switch between being a symlink and a non-symlink simply by toggling its svn:special property, and new checkouts will automatically write a file of the appropriate type. Likewise, in subversion 1.6 and older, running "svn update" would notice changes in file…
Ramsay Jones
MALLOC_CHECK: Allow checking to be disabled from config.mak The malloc checks can be disabled using the TEST_NO_MALLOC_CHECK variable, either from the environment or command line of an 'make test' invocation. In order to allow the malloc checks to be disabled from the 'config.mak' file, we add TEST_NO_MALLOC_CHECK to the environment using an export directive. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@p…
Nguyen Thai Ngoc Duy
attr: a note about the order of .gitattributes lookup This is the documentation part of 1a9d7e9 (attr.c: read .gitattributes from index as well. - 2007-08-14) 06f33c1 (Read attributes from the index that is being checked out - 2009-03-13) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: l10n: de.po: fix a few minor typos
Øyvind A. Holm
configure.ac: Add missing comma to CC_LD_DYNPATH 40bfbde ("build: don't duplicate substitution of make variables", 2012-09-11) by mistake removed a necessary comma at the end of "CC_LD_DYNPATH=-Wl,rpath," in line 414. When executing "./configure --with-zlib=PATH", this resulted in [...] CC xdiff/xhistogram.o AR xdiff/lib.a LINK git-credential-store /usr/bin/ld: bad -rpath option collect2: ld returned 1 exit status …
Junio C Hamano
Merge branch 'maint' of git://github.com/git-l10n/git-po into maint * 'maint' of git://github.com/git-l10n/git-po: l10n: de.po: fix a few minor typos
Ben Walton
tests: "cp -a" is a GNUism These tests just want a bit-for-bit identical copy; they do not need even -H (there is no symbolic link involved) nor -p (there is no funny permission or ownership issues involved). Just use "cp -R" instead. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra
Git url doc: mark ftp/ftps as read-only and deprecate them It is not even worth mentioning their removal; just discourage people from using them. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.8.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0-rc1
Junio C Hamano
Merge branch 'jc/maint-t1450-fsck-order-fix' The fsck test assumed too much on what kind of error it will detect. The only important thing is the inconsistency is detected as an error. * jc/maint-t1450-fsck-order-fix: t1450: the order the objects are checked is undefined
Junio C Hamano
Merge branch 'jc/merge-bases-paint-fix' "git fmt-merge-msg" (an internal helper reduce_heads() it uses) had a severe performance regression; an empty "git pull" took forever to finish as the result. * jc/merge-bases-paint-fix: paint_down_to_common(): parse commit before relying on its timestamp
Junio C Hamano
Sync with 1.7.12.3
Junio C Hamano
Git 1.7.12.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.12.3
Junio C Hamano
Merge branch 'os/commit-submodule-ignore' into maint "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. * os/commit-submodule-ignore: commit: pay attention to submodule.$name.ignore in .gitmodules
Junio C Hamano
Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maint "git receive-pack" (the counterpart to "git push") did not give progress output while processing objects it received to the puser when run over the smart-http protocol. * jk/receive-pack-unpack-error-to-pusher: receive-pack: drop "n/a" on unpacker errors receive-pack: send pack-processing stderr over sideband receive-pack: redirect unpack-objects stdout to /dev/null
Junio C Hamano
Merge branch 'rt/maint-clone-single' into maint A repository created with "git clone --single" had its fetch refspecs set up just like a clone without "--single", leading the subsequent "git fetch" to slurp all the other branches, defeating the whole point of specifying "only this branch". * rt/maint-clone-single: clone --single: limit the fetch refspec to fetched branch
Junio C Hamano
Merge branch 'jc/blame-follows-renames' into maint It was unclear in the documentation for "git blame" that it is unnecessary for users to use the "--follow" option. * jc/blame-follows-renames: git blame: document that it always follows origin across whole-file renames
  1. Prev
  2. Next