AgeCommit message (Collapse)Author
2008-02-29Fix builtin checkout crashing when given an invalid pathAlex Riesen
Signed-off-by: Alex Riesen <> Signed-off-by: Junio C Hamano <>
2008-02-29Merge branch 'maint'Junio C Hamano
* maint: templates/Makefile: don't depend on local umask setting Correct name of diff_flush() in API documentation Start preparing for Conflicts: RelNotes
2008-02-28templates/Makefile: don't depend on local umask settingGerrit Pape
Don't take the local umask setting into account when installing the templates/* files and directories, running 'make install' with umask set to 077 resulted in template/* installed with permissions 700 and 600. The problem was discovered by Florian Zumbiehl, reported through Signed-off-by: Gerrit Pape <> Signed-off-by: Junio C Hamano <>
2008-02-28Correct name of diff_flush() in API documentationDaniel Barkalow
Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2008-02-28Start preparing for C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-28format-patch: remove a leftover debugging messageJunio C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-28completion: support format-patch's --cover-letter optionJohannes Schindelin
Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2008-02-27Merge branch 'maint'Junio C Hamano
* maint: Eliminate confusing "won't bisect on seeked tree" failure builtin-reflog.c: don't install new reflog on write failure send-email: fix In-Reply-To regression Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR Prompt to continue when editing during rebase --interactive Documentation/git svn log: add a note about timezones. Don't use GIT_CONFIG in t5505-remote Conflicts: t/ t/
2008-02-27Merge branch 'git-p4' of git:// C Hamano
* 'git-p4' of git:// git-p4: Support usage of perforce client spec git-p4: git-p4 submit cleanups. git-p4: Removed git-p4 submit --direct. git-p4: Clean up git-p4 submit's log message handling. git-p4: Remove --log-substitutions feature. git-p4: support exclude paths
2008-02-27Eliminate confusing "won't bisect on seeked tree" failureCarl Worth
This error message is very confusing---it doesn't tell the user anything about how to fix the situation. And the actual fix for the situation ("git bisect reset") does a checkout of a potentially random branch, (compared to what the user wants to be on for the bisect she is starting). The simplest way to eliminate the confusion is to just make "git bisect start" do the cleanup itself. There's no significant loss of safety here since we already have a general safety in the form of the reflog. Note: We preserve the warning for any cogito users. We do this by switching from .git/head-name to .git/BISECT_START for the extra state, (which is a more descriptive name anyway). Signed-off-by: Carl Worth <> Signed-off-by: Junio C Hamano <>
2008-02-27builtin-reflog.c: don't install new reflog on write failureBrandon Casey
When expiring reflog entries, a new temporary log is written which contains only the entries to retain. After it is written, it is renamed to replace the existing reflog. Currently, we check that writing of the new log is successful and print a message on failure, but the original reflog is still replaced with the new reflog even on failure. This patch causes the original reflog to be retained if we fail when writing the new reflog. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2008-02-27send-email: fix In-Reply-To regressionJay Soffian
Fix a regression introduced by 1ca3d6e (send-email: squelch warning due to comparing undefined $_ to "") where if the user was prompted for an initial In-Reply-To and didn't provide one, messages would be sent out with an invalid In-Reply-To of "<>" Also add test cases for the regression and the fix. A small modification was needed to allow send-email to take its replies from stdin if the environment variable GIT_SEND_EMAIL_NOTTY is set. Signed-off-by: Jay Soffian <> Signed-off-by: Junio C Hamano <>
2008-02-27git-svn: Don't prompt for client cert password everytime.Sebastian Noack
Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2008-02-27git.el: Do not display empty directories.Alexandre Julliard
Signed-off-by: Alexandre Julliard <> Tested-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2008-02-27Merge branch 'jm/free'Junio C Hamano
* jm/free: Avoid unnecessary "if-before-free" tests. Conflicts: builtin-branch.c
2008-02-27Merge branch 'js/branch-track'Junio C Hamano
* js/branch-track: doc: documentation update for the branch track changes branch: optionally setup branch.*.merge from upstream local branches Conflicts: Documentation/config.txt Documentation/git-branch.txt Documentation/git-checkout.txt builtin-branch.c cache.h t/
2008-02-27Merge branch 'db/checkout'Junio C Hamano
* db/checkout: (21 commits) checkout: error out when index is unmerged even with -m checkout: show progress when checkout takes long time while switching branches Add merge-subtree back checkout: updates to tracking report builtin-checkout.c: Remove unused prefix arguments in switch_branches path checkout: work from a subdirectory checkout: tone down the "forked status" diagnostic messages Clean up reporting differences on branch switch builtin-checkout.c: fix possible usage segfault checkout: notice when the switched branch is behind or forked Build in checkout Move code to clean up after a branch change to branch.c Library function to check for unmerged index entries Use diff -u instead of diff in t7201 Move create_branch into a library file Build-in merge-recursive Add "skip_unmerged" option to unpack_trees. Discard "deleted" cache entries after using them to update the working tree Send unpack-trees debugging output to stderr Add flag to make unpack_trees() not print errors. ... Conflicts: Makefile
2008-02-27Merge branch 'db/cover-letter'Junio C Hamano
* db/cover-letter: Improve collection of information for format-patch --cover-letter Add API access to shortlog t4014: Replace sed's non-standard 'Q' by standard 'q' Support a --cc=<email> option in format-patch Combine To: and Cc: headers Fix format.headers not ending with a newline Add tests for extra headers in format-patch Add a --cover-letter option to format-patch Export some email and pretty-printing functions Improve message-id generation flow control for format-patch Add more tests for format-patch Conflicts: builtin-log.c builtin-shortlog.c pretty.c
2008-02-27Merge branch 'js/merge'Junio C Hamano
* js/merge: xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
2008-02-27Merge branch 'cw/bisect'Junio C Hamano
* cw/bisect: Eliminate confusing "won't bisect on seeked tree" failure
2008-02-27Merge branch 'jk/help-alias'Junio C Hamano
* jk/help-alias: help: respect aliases make alias lookup a public, procedural function help: use parseopt
2008-02-27Merge branch 'js/run-command'Junio C Hamano
* js/run-command: start_command(), if .in/.out > 0, closes file descriptors, not the callers start_command(), .in/.out/.err = -1: Callers must close the file descriptor
2008-02-27Merge branch 'jc/diff-relative'Junio C Hamano
* jc/diff-relative: diff --relative: help working in a bare repository diff --relative: output paths as relative to the current subdirectory
2008-02-27Merge branch 'gp/hash-stdin'Junio C Hamano
* gp/hash-stdin: hash-object: cleanup handling of command line options
2008-02-27Merge branch 'db/push-single-with-HEAD'Junio C Hamano
* db/push-single-with-HEAD: Resolve value supplied for no-colon push refspecs
2008-02-27Merge branch 'db/host-alias'Junio C Hamano
* db/host-alias: url rewriting: take longest and first match Add support for url aliases in config files Use ALLOC_GROW in remote.{c,h}
2008-02-27Merge branch 'ae/pack-autothread'Junio C Hamano
* ae/pack-autothread: Revert "pack-objects: Print a message describing the number of threads for packing" pack-objects: Print a message describing the number of threads for packing pack-objects: Add runtime detection of online CPU's
2008-02-27Merge branch 'bc/reflog-fix'Junio C Hamano
* bc/reflog-fix: builtin-reflog.c: don't install new reflog on write failure
2008-02-27Merge branch 'sp/describe'Junio C Hamano
* sp/describe: Use git-describe --exact-match in bash prompt on detached HEAD Teach git-describe --exact-match to avoid expensive tag searches Avoid accessing non-tag refs in git-describe unless --all is requested Teach git-describe to use peeled ref information when scanning tags Optimize peel_ref for the current ref of a for_each_ref callback
2008-02-27Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIRJohan Herland
When using the '-w $cvsdir' option to cvsexportcommit, it will chdir into $cvsdir before executing several other git commands. If $GIT_DIR is set to a relative path (e.g. '.'), the git commands executed by cvsexportcommit will naturally fail. Therefore, ensure that $GIT_DIR is absolute before the chdir to $cvsdir. Signed-off-by: Johan Herland <> Signed-off-by: Junio C Hamano <>
2008-02-27Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIRJohan Herland
The testcase verifies that 'git cvsexportcommit' functions correctly when the '-w' option is used, and GIT_DIR is set to a relative path (e.g. '.'). Signed-off-by: Johan Herland <> Signed-off-by: Junio C Hamano <>
2008-02-27Prompt to continue when editing during rebase --interactiveJonathan del Strother
On hitting an edit point in an interactive rebase, git should prompt the user to run "git rebase --continue" Signed-off-by: Jonathan del Strother <> Signed-off-by: Junio C Hamano <>
2008-02-27Documentation/git svn log: add a note about timezones.Miklos Vajna
git svn log mimics the timezone converting behaviour of svn log, but this was undocumented. Signed-off-by: Miklos Vajna <> Signed-off-by: Junio C Hamano <>
2008-02-27Merge branch 'js/maint-http-push' into maintJunio C Hamano
* js/maint-http-push: http-push: avoid a needless goto http-push: do not get confused by submodules http-push: avoid invalid memory accesses
2008-02-27git-p4: Support usage of perforce client specTor Arvid Lund
When syncing, git-p4 will only download files that are included in the active perforce client spec. This does not change the default behaviour - it requires that the user either supplies the command line argument --use-client-spec, or sets the git config option p4.useclientspec to "true". Signed-off-by: Tor Arvid Lund <> Signed-off-by: Simon Hausmann <>
2008-02-27git-p4: git-p4 submit cleanups.Simon Hausmann
Removed storing the list of commits in a configuration file. We only need the list of commits at run-time. Signed-off-by: Simon Hausmann <>
2008-02-27git-p4: Removed git-p4 submit --direct.Simon Hausmann
This feature was originally meant to allow for quicker direct submits into perforce, but it turns out that it is not actually quicker than doing a git commit and then running git-p4 submit. Signed-off-by: Simon Hausmann <>
2008-02-27git-p4: Clean up git-p4 submit's log message handling.Simon Hausmann
Instead of trying to substitute fields in the p4 submit template we now simply replace the description of the submit with the log message of the git commit. Signed-off-by: Simon Hausmann <>
2008-02-27git-p4: Remove --log-substitutions feature.Simon Hausmann
This turns out to be rarely useful and is already covered by git's commit.template configuration variable. Signed-off-by: Simon Hausmann <>
2008-02-27git-p4: support exclude pathsTommy Thorn
Teach git-p4 about the -/ option which adds depot paths to the exclude list, used when cloning. The option is chosen such that the natural Perforce syntax works, eg: git p4 clone //branch/path/... -//branch/path/{large,old}/... Trailing ... on exclude paths are optional. This is a generalization of a change by Dmitry Kakurin (thanks). Signed-off-by: Tommy Thorn <> Signed-off-by: Simon Hausmann <>
2008-02-27Don't use GIT_CONFIG in t5505-remoteDaniel Barkalow
For some reason, t5505-remote was setting GIT_CONFIG to .git/config and exporting it. This should have been no-op, as test framework did the same for a long time anyway. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2008-02-27Add '--fixed-strings' option to "git log --grep" and friendsJakub Narebski
Add support for -F | --fixed-strings option to "git log --grep" and friends: "git log --author", "git log --committer=<pattern>". Code is based on implementation of this option in "git grep". Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2008-02-27Revert "pack-objects: Print a message describing the number of threads for ↵Junio C Hamano
packing" This reverts commit 6c723f5e6bc579e06a904874f1ceeb8ff2b5a17c. The additional message may be interesting for git developers, but not useful for the end users, and clutters the output.
2008-02-26git-apply --whitespace=fix: fix off by one thinkoJunio C Hamano
When a patch adds a whitespace followed by end-of-line, the trailing whitespace error was detected correctly but was not fixed, due to misconversion in 42ab241 (builtin-apply.c: do not feed copy_wsfix() leading '+'). Signed-off-by: Junio C Hamano <>
2008-02-26Merge branch 'maint'Junio C Hamano
* maint: Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest timezone_names[]: fixed the tz offset for New Zealand. filter-branch documentation: non-zero exit status in command abort the filter rev-parse: fix potential bus error with --parseopt option spec handling Use a single implementation and API for copy_file() Documentation/git-filter-branch: add a new msg-filter example Correct fast-export file mode strings to match fast-import standard
2008-02-26gitweb: Better cutting matched string and its contextJakub Narebski
Improve look of commit search output ('search' view) by better cutting of matched string and its context in match info, as suggested by Junio. For example, if you are looking for "very long search string" in the following line: Could somebody test this with very long search string, and see how you would now see: ...this with <<very long ... string>>, and see... instead of: Could som... <<very long search...>>, and see... (where <<something>> denotes emphasized / colored fragment; matched fragment to be more exact). For this feature, support for fourth [optional] parameter to chop_str subroutine was added. This fourth parameter is used to denote where to cut string to make it shorter. chop_str can now cut at the beginning (from the _left_ side of the string), in the middle (_center_ of the string), or at the end (from the _right_ side of the string); cutting from right is the default: chop_str(somestring, len, slop, 'left') -> ' ...string' chop_str(somestring, len, slop, 'center') -> 'som ... ing' chop_str(somestring, len, slop, 'right') -> 'somestr... ' If you want to use default slop (default additional length), use undef as value for third parameter to chop_str. While at it, return from chop_str early if given string is so short that chop_str couldn't shorten it. Simplify also regexp used by chop_str. Make ellipsis (dots) stick to shortened fragment for cutting at ends, to better see which part got shortened. Simplify passing all arguments to chop_str in chop_and_escape_str subroutine. This was needed to pass additional options to chop_str. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2008-02-26Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotestBryan Donlan
Signed-off-by: Bryan Donlan <> Signed-off-by: Junio C Hamano <>
2008-02-26timezone_names[]: fixed the tz offset for New Zealand.Steven Drake
Signed-off-by: Junio C Hamano <>
2008-02-26filter-branch documentation: non-zero exit status in command abort the filterCaio Marcelo de Oliveira Filho
Since commit 8c1ce0f46b85d40f215084eed7313896300082df filter-branch fails when a <command> has a non-zero exit status. This commit makes it clear in the documentation and also fixes the parent-filter example, that was incorrectly returning non-zero when the commit being tested wasn't the one to be rewritten. Signed-off-by: Caio Marcelo de Oliveira Filho <> Signed-off-by: Junio C Hamano <>
2008-02-26rev-parse: fix potential bus error with --parseopt option spec handlingJay Soffian
A non-empty line containing no spaces should be treated by --parseopt as an option group header, but was causing a bus error. Also added a test script for rev-parse --parseopt. Signed-off-by: Jay Soffian <> Signed-off-by: Junio C Hamano <>