1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Merge branch 'jk/remote-helpers-in-python-3' into next Prepare remote-helper test written in Python to be run with Python3. * jk/remote-helpers-in-python-3: git-remote-testpy: call print as a function git-remote-testpy: don't do unbuffered text I/O git-remote-testpy: hash bytes explicitly svn-fe: allow svnrdump_sim.py to run with Python 3 git_remote_helpers: use 2to3 if building with Python 3 git_remote_helpers: force rebuild if python ve…
Branches
next
Junio C Hamano
Merge branch 'rr/minimal-stat' into next Some reimplementations of Git does not write all the stat info back to the index due to their implementation limitations (e.g. jgit running on Java). A configuration option can tell Git to ignore changes to most of the stat fields and only pay attention to mtime and size, which these implementations can reliably update. This avoids excessive revalidation of contents. * rr/minimal-stat: Enable…
Branches
next
Junio C Hamano
Merge branch 'jc/custom-comment-char' into next A configuration variable allows users to change the hint lines in the edited text to begin with something other than '#'. This is half my work and half by Ralf Thielow. There may still be leftover '#' lurking around, though. My "git grep" says C code should be already fine, but git-rebase--interactive.sh could be converted (it should not matter, as the file is not really a free-form text). I d…
Branches
next
Junio C Hamano
Merge branch 'nd/magic-pathspec-from-root' into next * nd/magic-pathspec-from-root: grep: avoid accepting ambiguous revision Update :/abc ambiguity check
Branches
next
Junio C Hamano
Merge branch 'tb/t0050-maint' into next * tb/t0050-maint: t0050: Use TAB for indentation t0050: honor CASE_INSENSITIVE_FS in add (with different case) t0050: known breakage vanished in merge (case change)
Branches
next
Junio C Hamano
Merge branch 'jc/help' into next A header file that has the definition of a static array was included in two places, wasting the space. * jc/help: help: include <common-cmds.h> only in one file
Branches
next
Junio C Hamano
Merge branch 'dl/am-hg-locale' into next Datestamp recorded in "Hg" format patch was reformatted incorrectly to an e-mail looking date using locale dependant strftime, causing patch application to fail. * dl/am-hg-locale: am: invoke perl's strftime in C locale
Branches
next
Junio C Hamano
Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into next Fix use of an array notation that older versions of bash do not understand. * bc/fix-array-syntax-for-3.0-in-completion-bash: git-completion.bash: replace zsh notation that breaks bash 3.X
Branches
next
Junio C Hamano
Merge branch 'master' into next * master: Update draft release notes to 1.8.2 howto/maintain: document "### match next" convention in jch/pu branch git-svn: Simplify calculation of GIT_DIR git-svn: cleanup sprintf usage for uppercasing hex Makefile: add description on PERL/PYTHON_PATH
Branches
next
Junio C Hamano
Merge branch 'for-junio' of git://bogomips.org/git-svn * 'for-junio' of git://bogomips.org/git-svn: git-svn: Simplify calculation of GIT_DIR git-svn: cleanup sprintf usage for uppercasing hex
Junio C Hamano
Update draft release notes to 1.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/retire-fnmatch' Replace our use of fnmatch(3) with a more feature-rich wildmatch. A handful patches at the bottom have been moved to nd/wildmatch to graduate as part of that branch, before this series solidifies. We may want to mark USE_WILDMATCH as an experimental curiosity a bit more clearly (i.e. should not be enabled in production environment, because it will make the behaviour between builds unpredictable).…
Junio C Hamano
Merge branch 'jc/doc-maintainer' Describe tools for automation that were invented since this document was originally written. * jc/doc-maintainer: howto/maintain: document "### match next" convention in jch/pu branch howto/maintain: mark titles for asciidoc Documentation: update "howto maintain git"
Junio C Hamano
howto/maintain: document "### match next" convention in jch/pu branch Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
ident: do not drop username when reading from /etc/mailname An earlier conversion from fgets() to strbuf_getline() in the codepath to read from /etc/mailname to learn the default host-part of the ident e-mail address forgot that strbuf_getline() stores the line at the beginning of the buffer just like fgets(). The "username@" the caller has prepared in the strbuf, expecting the function to append the host-part to it, was lost because of this. Reported-by…
Junio C Hamano
push: finishing touches to explain REJECT_ALREADY_EXISTS better Now that "already exists" errors are given only when a push tries to update an existing ref in refs/tags/ hierarchy, we can say "the tag", instead of "the destination reference", and that is far easier to understand. Pointed out by Chris Rorvick. Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping
git-remote-testpy: call print as a function This is harmless in Python 2, which sees the parentheses as redundant grouping, but is required for Python 3. Since this is the only change required to make this script just run under Python 3 without needing 2to3 it seems worthwhile. The case of an empty print must be handled specially because in that case Python 2 will interpret '()' as an empty tuple and print it as '()'; inserting an empty s…
John Keeping
git-remote-testpy: don't do unbuffered text I/O Python 3 forbids unbuffered I/O in text mode. Change the reading of stdin in git-remote-testpy so that we read the lines as bytes and then decode them a line at a time. This allows us to keep the I/O unbuffered in order to avoid reintroducing the bug fixed by commit 7fb8e16 (git-remote-testgit: fix race when spawning fast-import). Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: …
John Keeping
git-remote-testpy: hash bytes explicitly Under Python 3 'hasher.update(...)' must take a byte string and not a unicode string. Explicitly encode the argument to this method to hex bytes so that we don't need to worry about failures to encode that might occur if we chose a textual encoding. This changes the directory used by git-remote-testpy for its git mirror of the remote repository, but this tool should not have any serious users as…
John Keeping
svn-fe: allow svnrdump_sim.py to run with Python 3 The changes to allow this script to run with Python 3 are minimal and do not affect its functionality on the versions of Python 2 that are already supported (2.4 onwards). Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping
git_remote_helpers: use 2to3 if building with Python 3 Using the approach detailed in the Python documentation[1], run 2to3 on the code as part of the build if building with Python 3. The code itself requires no changes to convert cleanly. [1] http://docs.python.org/3.3/howto/pyporting.html#during-installation Signed-off-by: John Keeping <john@keeping.me.uk> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@po…
John Keeping
git_remote_helpers: force rebuild if python version changes When different version of python are used to build via distutils, the behaviour can change. Detect changes in version and pass --force in this case. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
t9902: protect test from stray build artifacts When you have random build artifacts in your build directory, left behind by running "make" while on another branch, the "git help -a" command run by __git_list_all_commands in the completion script that is being tested does not have a way to know that they are not part of the subcommands this build will ship. Such extra subcommands may come from the user's $PATH. They will interfere with the te…
Junio C Hamano
push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE When we push to update an existing ref, if: * the object at the tip of the remote is not a commit; or * the object we are pushing is not a commit, it won't be correct to suggest to fetch, integrate and push again, as the old and new objects will not "merge". We should explain that the push must be forced when there is a non-committish object is involved in such a case. If we do not have the …
Junio C Hamano
push: further simplify the logic to assign rejection reason First compute the reason why this push would fail if done without "--force", and then fail it by assigning that reason when the push was not forced (or if there is no reason to require force, allow it to succeed). Record the fact that the push was forced in the forced_update field only when the push would have failed without the option. The code becomes shorter, less repetitive and easier to rea…
Junio C Hamano
push: further clean up fields of "struct ref" The "nonfastforward" and "update" fields are only used while deciding what value to assign to the "status" locally in a single function. Remove them from the "struct ref". The "requires_force" field is not used to decide if the proposed update requires a --force option to succeed, or to record such a decision made elsewhere. It is used by status reporting code that the particular update was "fo…
Alexey Shumkin
t7102 (reset): don't hardcode SHA-1 in expected outputs Take the expected SHA-1 digest in a variable, and use it instead of hardcoding when checking the result. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping
git-cvsimport.txt: cvsps-2 is deprecated git-cvsimport relies on version 2 of cvsps and does not work with the new version 3. Since cvsps 3.x does not currently work as well as version 2 for incremental import, document this fact. Specifically, there is no way to make new git-cvsimport that supports cvsps 3.x and have a seamless transition for existing users since cvsps 3.x needs a time from which to continue importing and git-cvsimpor…
Barry Wardell
git-svn: Simplify calculation of GIT_DIR Since git-rev-parse already checks for the $GIT_DIR environment variable and that it returns an actual git repository, there is no need to repeat the checks again here. This also fixes a problem where git-svn did not work in cases where .git was a file with a gitdir: link. [ew: squashed test case, delay setting GIT_DIR until after `git rev-parse --cdup` to fix t9101, (thanks to Junio)] Signed…
Eric Wong
git-svn: cleanup sprintf usage for uppercasing hex We do not need to call uc() separately for sprintf("%x") as sprintf("%X") is available. Signed-off-by: Eric Wong <normalperson@yhbt.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
  1. Prev
  2. Next