1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 * jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE
Junio C Hamano
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5 * tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state
Junio C Hamano
Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5 * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type
Junio C Hamano
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5 * jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file
Junio C Hamano
Teach @{upstream} syntax to strbuf_branchanme() This teaches @{upstream} syntax to interpret_branch_name(), instead of dwim_ref() machinery. There are places in git UI that behaves differently when you give a local branch name and when you give an extended SHA-1 expression that evaluates to the commit object name at the tip of the branch. The intent is that the special syntax such as @{-1} can stand in as if the user spelled the name of the b…
Junio C Hamano
t1506: more test for @{upstream} syntax This adds a few more tests that exercises @{upstream} syntax by commands that operate differently when they are given branch name as opposed to a refname (i.e. where "master" and "refs/heads/master" makes a difference). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Fix "checkout A..." synonym for "checkout A...HEAD" on Windows When switching to a different commit, we first see the named rev exists as a commit using lookup_commit_reference_gently(), and set new.path to a string "refs/heads/" followed by the name the user gave us (but after taking into special short-hands like @{-1} == "previous branch" and "@{upstream}" == "the branch we merge with" into account). If the resulting string names an existsing ref, then we …
Junio C Hamano
status: don't require the repository to be writable We need to update the index before hooks run when actually making a commit, but we shouldn't have to write the index when running "status". If we can, then we have already spent cycles to refresh the index and it is a waste not to write it out, but it is not a disaster if we cannot write it out. The main reason the user is running "git status" is to get the "status", and refreshing the index is a…
Junio C Hamano
Merge branch 'maint' * maint: bisect: fix singular/plural grammar nit
Johannes Sixt
Makefile: honor NO_CURL when setting REMOTE_CURL_* variables Previously, these variables were set before there was a chance to set NO_CURL. This made a difference only during 'make install', because by installing $(REMOTE_CURL_ALIASES), the rule tries to access $(REMOTE_CURL_PRIMARY), which was never installed. On Windows, this fails; on Unix, stale symbolic links are created. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Ilari Liusvaara <ilari.l…
tarm
ident.c: replace fprintf with fputs to suppress compiler warning Compiling today's pu gave ... CC ident.o CC levenshtein.o ident.c: In function 'fmt_ident': ident.c:206: warning: format not a string literal and no format arguments CC list-objects.o ... This warning seems to have appeared first in 18e95f279ec6 (ident.c: remove unused variables) which removed additional fprintf arguments. Suppress this warning by using fputs instead of fprin…
Nguyễn Thái Ngọc Duy
rm: only refresh entries that we may touch This gets rid of the whole tree cache refresh. Instead only path that we touch will get refreshed. We may still lstat() more than needed, but it'd be better playing safe. This potentially reduces a large number of lstat() on big trees. Take gentoo-x86 tree for example, which has roughly 80k files: Unmodified Git: $ time git rm --cached skel.ebuild rm 'skel.ebuild' real 0m1.441s user 0m0.…
David Ripton
bisect: fix singular/plural grammar nit Remove the trailing 's' from "revisions" and "steps" when there is only one. Signed-off-by: David Ripton <dripton@ripton.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Walton
cvsimport: standarize system() calls to external git tools This patch standardizes calls to system() where external git tools are called. Instead of system("git foo ... "), use system(qw(git foo ...)). All calls are made without the use of an 'sh -c' process to split the arguments. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Walton
cvsimport: standarize open() calls to external git tools Standardize calls to open() where external git tools are used as part of a pipeline. Instead of open(X, "git foo ... |)", use open(X, "-|", qw(git foo ...)). All calls are made without the use of an 'sh -c' process to split the arguments. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Walton
cvsimport: modernize callouts to git subcommands This patch updates all calling conventions for external git tools. to use the modern calling convention (eg: git foo instead of git-foo). This is almost entierly a s/git-/git / operation, with deviations only as required to keep tests passing. Reported-by: Alexander Maier <amaier@opencsw.org> Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Fix mis-backport of t7002 base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file desc…
Junio C Hamano
Merge branch 'maint-1.6.3' into maint-1.6.4 * maint-1.6.3: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup …
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3 * maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup …
Junio C Hamano
Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 * commit 'v1.6.4.4-8-g8de6518': Fix mis-backport of t7002
Junio C Hamano
Fix mis-backport of t7002 The original patch that became cfe370c (grep: do not segfault when -f is used, 2009-10-16), was made against "maint" or newer branch back then, but the fix addressed the issue that was present as far as in 1.6.4 series. The maintainer backported the patch to the 1.6.4 maintenance branch, but failed to notice that the new tests assumed the setup done by the script in "maint", which did quite a lot…
Junio C Hamano
Update draft release notes to 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: Update draft release notes to 1.6.6.1 grep: NUL terminate input from a file fast-import: tag may point to any object type
Junio C Hamano
Update draft release notes to 1.6.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type
Junio C Hamano
Merge branch 'jc/rerere' * jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
Junio C Hamano
Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' * pc/uninteresting-submodule-disappear-upon-switch-branches: Remove empty directories when checking out a commit with fewer submodules
Junio C Hamano
Merge branch 'nd/include-termios-for-osol' * nd/include-termios-for-osol: Add missing #include to support TIOCGWINSZ on Solaris
Junio C Hamano
Merge branch 'js/windows' * js/windows: Do not use date.c:tm_to_time_t() from compat/mingw.c MSVC: Windows-native implementation for subset of Pthreads API MSVC: Fix an "incompatible pointer types" compiler warning Windows: avoid the "dup dance" when spawning a child process Windows: simplify the pipe(2) implementation Windows: boost startup by avoiding a static dependency on shell32.dll Windows: disable Pyth…
Matthieu Moy
branch: warn and refuse to set a branch as a tracking branch of itself. Previous patch allows commands like "git branch --set-upstream foo foo", which doesn't make much sense. Warn the user and don't change the configuration in this case. Don't die to let the caller finish its job in such case. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next