1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
fsck: drop unused parameter from traverse_one_object() Also add comments to seemingly unsafe pointer dereferences, that are all safe. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Adam Tkac
Don't pass "--xhtml" to hightlight in gitweb.perl script. The "--xhtml" option is supported only in highlight < 3.0. There is no option to enforce (X)HTML output format compatible with both highlight < 3.0 and highlight >= 3.0. However default output format is HTML so we don't need to explicitly specify it. Signed-off-by: Adam Tkac <atkac@redhat.com> Helped-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: rebase -i: clarify in-editor documentation of "exec" tests: sanitize more git environment variables fast-import: treat filemodify with empty tree as delete rebase: give a better error message for bogus branch rebase: use explicit "--" with checkout Conflicts: t/t9300-fast-import.sh
Jonathan Nieder
rebase -i: clarify in-editor documentation of "exec" The hints in the current "instruction sheet" template look like so: # Rebase 3f14246..a1d7e01 onto 3f14246 # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x <cmd>, exec <c…
Jeff King
tests: sanitize more git environment variables These variables should generally not be set in one's environment, but they do get set by rebase, which means doing an interactive rebase like: pick abcd1234 foo exec make test will cause false negatives in the test suite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/fast-import-empty-tree-removal' into maint * jn/fast-import-empty-tree-removal: fast-import: treat filemodify with empty tree as delete
Jonathan Nieder
fast-import: treat filemodify with empty tree as delete Normal git processes do not allow one to build a tree with an empty subtree entry without trying hard at it. This is in keeping with the general UI philosophy: git tracks content, not empty directories. v1.7.3-rc0~75^2 (2010-06-30) changed that by making it easy to include an empty subtree in fast-import's active commit: M 040000 4b825dc642cb6eb9a060e54bf8d69288fbee4904 subdir One can trigger…
Jeff King
rebase: give a better error message for bogus branch When you give a non-existent branch to git-rebase, it spits out the usage. This can be confusing, since you may understand the usage just fine, but simply have made a mistake in the branch name. Before: $ git rebase origin bogus Usage: git rebase ... After: $ git rebase origin bogus fatal: no such branch: bogus Usage: git rebase ... Signed-off-by: Jeff King <peff@peff.net> Signed-of…
Jeff King
rebase: use explicit "--" with checkout In the case of a ref/pathname conflict, checkout will already do the right thing and checkout the ref. However, for a non-existant ref, this has two advantages: 1. If a file with that pathname exists, rebase will refresh the file from the index and then rebase the current branch instead of producing an error. 2. If no such file exists, the error message using an explicit "--" …
Junio C Hamano
Git 1.7.4-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4-rc3
Junio C Hamano
Merge branch 'as/userdiff-pascal' * as/userdiff-pascal: userdiff: match Pascal class methods
Junio C Hamano
Merge branch 'jn/setup-fixes' * jn/setup-fixes: t1510: fix typo in the comment of a test Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase Subject: setup: officially support --work-tree without --git-dir tests: compress the setup tests tests: cosmetic improvements to the repo-setup test t/README: hint about using $(pwd) rather than $PWD in tests Fix expected values of setup tests on Win…
Jonathan Nieder
t1510: fix typo in the comment of a test Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
Subject: setup: officially support --work-tree without --git-dir The original intention of --work-tree was to allow people to work in a subdirectory of their working tree that does not have an embedded .git directory. Because their working tree, which their $cwd was in, did not have an embedded .git, they needed to use $GIT_DIR to specify where it is, and because this meant there was no way to discover where the root level of the working tree was, so we needed…
Jonathan Nieder
Documentation: do not treat reset --keep as a special case The current treatment of "git reset --keep" emphasizes how it differs from --hard (treatment of local changes) and how it breaks down into plumbing (git read-tree -m -u HEAD <commit> followed by git update-ref HEAD <commit>). This can discourage people from using it, since it might seem to be a complex or niche option. Better to emphasize what the --keep flag is intended for --- moving the index…
Björn Steinbrink
Correctly report corrupted objects The errno check added in commit 3ba7a06 "A loose object is not corrupt if it cannot be read due to EMFILE" only checked for whether errno is not ENOENT and thus incorrectly treated "no error" as an error condition. Because of that, it never reached the code path that would report that the object is corrupted and instead caused funny errors like: fatal: failed to read object 333c4768ce595793fda…
Jonathan Nieder
tests: compress the setup tests New test helpers: - setup_repo, to initialize a repository or gitfile pointing to a repository, with core.bare and core.worktree set as specified; - try_case, to run setup from a given directory and validate the result, with GIT_DIR and GIT_WORK_TREE set as specified; - try_repo, to initialize a repository and call "try_case" from the toplevel and a subdirectory; - run_wt_tests, t…
Jonathan Nieder
tests: cosmetic improvements to the repo-setup test Give an overview in "sh t1510-repo-setup.sh --help" output. Waste some vertical and horizontal space for clearer code. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: exec_cmd: remove unused extern
kusma
exec_cmd: remove unused extern This definition was added by commit 77cb17e9, but it's left unused since commit 511707d. Remove the left-over definition. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/gitweb-no-logo' into maint * jn/gitweb-no-logo: gitweb: make logo optional
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' into maint * jk/diff-driver-binary-doc: docs: explain diff.*.binary option
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url' into maint * tr/submodule-relative-scp-url: submodule: fix relative url parsing for scp-style origin
Junio C Hamano
Merge branch 'rj/maint-difftool-cygwin-workaround' into maint * rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin
Junio C Hamano
Merge branch 'rj/maint-test-fixes' into maint * rj/maint-test-fixes: t9501-*.sh: Fix a test failure on Cygwin lib-git-svn.sh: Add check for mis-configured web server variables lib-git-svn.sh: Avoid setting web server variables unnecessarily t9142: Move call to start_httpd into the setup test t3600-rm.sh: Don't pass a non-existent prereq to test #15
Junio C Hamano
Merge branch 'jn/maint-gitweb-pathinfo-fix' into maint * jn/maint-gitweb-pathinfo-fix: gitweb: Fix handling of whitespace in generated links
Junio C Hamano
Merge branch 'ak/describe-exact' into maint * ak/describe-exact: describe: Delay looking up commits until searching for an inexact match describe: Store commit_names in a hash table by commit SHA1 describe: Do not use a flex array in struct commit_name describe: Use for_each_rawref
Junio C Hamano
Merge branch 'jn/maint-fast-import-object-reuse' into maint * jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket
Junio C Hamano
Merge branch 'jn/submodule-b-current' into maint * jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails
  1. Prev
  2. Next