gitweb.git
Merge branch 'jn/gitweb-log-history'Junio C Hamano Sat, 21 Nov 2009 07:45:39 +0000 (23:45 -0800)

Merge branch 'jn/gitweb-log-history'

* jn/gitweb-log-history:
gitweb: Make 'history' view (re)use git_log_generic()
gitweb: Refactor common parts of 'log' and 'shortlog' views
gitweb: Refactor 'log' action generation, adding git_log_body()

Merge branch 'jn/help-everywhere'Junio C Hamano Sat, 21 Nov 2009 07:44:52 +0000 (23:44 -0800)

Merge branch 'jn/help-everywhere'

* jn/help-everywhere: (23 commits)
diff --no-index: make the usage string less scary
merge-{recursive,subtree}: use usagef() to print usage
Introduce usagef() that takes a printf-style format
Let 'git <command> -h' show usage without a git dir
Show usage string for 'git http-push -h'
Let 'git http-fetch -h' show usage outside any git repository
Show usage string for 'git stripspace -h'
Show usage string for 'git unpack-file -h'
Show usage string for 'git show-index -h'
Show usage string for 'git rev-parse -h'
Show usage string for 'git merge-one-file -h'
Show usage string for 'git mailsplit -h'
Show usage string for 'git imap-send -h'
Show usage string for 'git get-tar-commit-id -h'
Show usage string for 'git fast-import -h'
Show usage string for 'git check-ref-format -h'
http-fetch: add missing initialization of argv0_path
Show usage string for 'git show-ref -h'
Show usage string for 'git merge-ours -h'
Show usage string for 'git commit-tree -h'
...

Conflicts:
imap-send.c

Merge branch 'jp/fetch-cull-many-refs'Junio C Hamano Sat, 21 Nov 2009 07:44:35 +0000 (23:44 -0800)

Merge branch 'jp/fetch-cull-many-refs'

* jp/fetch-cull-many-refs:
remote: fix use-after-free error detected by glibc in ref_remove_duplicates
fetch: Speed up fetch of large numbers of refs
remote: Make ref_remove_duplicates faster for large numbers of refs

describe: do not use unannotated tag even if exact... Thomas Rast Wed, 18 Nov 2009 13:32:26 +0000 (14:32 +0100)

describe: do not use unannotated tag even if exact match

4d23660 (describe: when failing, tell the user about options that
work, 2009-10-28) forgot to update the shortcut path where the code
detected and used a possible exact match. This means that an
unannotated tag on HEAD would be used by 'git describe'.

Guard this code path against the new circumstances, where unannotated
tags can be present in ->util even if we're not actually planning to
use them.

While there, also add some tests for --all.

Reported by 'yashi' on IRC.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule.c: Squelch a "use before assignment" warningDavid Aguilar Fri, 20 Nov 2009 11:33:53 +0000 (03:33 -0800)

submodule.c: Squelch a "use before assignment" warning

i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5493) compiler
(and probably others) mistakenly thinks variable 'right' is used
before assigned. Work around it by giving it a fake initialization.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'np/maint-sideband-favor-status'Junio C Hamano Wed, 18 Nov 2009 06:03:20 +0000 (22:03 -0800)

Merge branch 'np/maint-sideband-favor-status'

* np/maint-sideband-favor-status:
give priority to progress messages

Merge branch 'sb/tutorial-test'Junio C Hamano Wed, 18 Nov 2009 06:03:02 +0000 (22:03 -0800)

Merge branch 'sb/tutorial-test'

* sb/tutorial-test:
t1200: prepare for merging with Fast-forward bikeshedding
t1200: further modernize test script style
t1200: Make documentation and test agree
t1200: cleanup and modernize test style

Merge branch 'ef/msys-imap'Junio C Hamano Wed, 18 Nov 2009 06:03:00 +0000 (22:03 -0800)

Merge branch 'ef/msys-imap'

* ef/msys-imap:
Windows: use BLK_SHA1 again
MSVC: Enable OpenSSL, and translate -lcrypto
mingw: enable OpenSSL
mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
imap-send: build imap-send on Windows
imap-send: fix compilation-error on Windows
imap-send: use run-command API for tunneling
imap-send: use separate read and write fds
imap-send: remove useless uid code

Merge git://git.bogomips.org/git-svnJunio C Hamano Tue, 17 Nov 2009 16:59:27 +0000 (08:59 -0800)

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
Document git-svn's first-parent rule
git svn: attempt to create empty dirs on clone+rebase
git svn: add authorsfile test case for ~/.gitconfig
git svn: read global+system config for clone+init
git svn: handle SVN merges from revisions past the tip of the branch

Document git-svn's first-parent ruleThomas Rast Mon, 16 Nov 2009 10:15:17 +0000 (11:15 +0100)

Document git-svn's first-parent rule

git-svn has the following rule to detect the SVN base for its
operations: find the first git-svn-id line reachable through
first-parent ancestry. IOW,

git log --grep=^git-svn-id: --first-parent -1

Document this, as it is very important when using merges with git-svn.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>

Update draft release notes to 1.6.6Junio C Hamano Mon, 16 Nov 2009 08:07:48 +0000 (00:07 -0800)

Update draft release notes to 1.6.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 1.6.5.3Junio C Hamano Mon, 16 Nov 2009 08:06:23 +0000 (00:06 -0800)

Sync with 1.6.5.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.6.5.3 v1.6.5.3Junio C Hamano Mon, 16 Nov 2009 08:05:12 +0000 (00:05 -0800)

Git 1.6.5.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'bs/maint-pre-commit-hook-sample' into... Junio C Hamano Mon, 16 Nov 2009 08:03:15 +0000 (00:03 -0800)

Merge branch 'bs/maint-pre-commit-hook-sample' into maint

* bs/maint-pre-commit-hook-sample:
pre-commit.sample: Diff against the empty tree when HEAD is invalid

Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano Mon, 16 Nov 2009 08:02:44 +0000 (00:02 -0800)

Merge branch 'jk/maint-add-p-empty' into maint

* jk/maint-add-p-empty:
add-interactive: handle deletion of empty files

Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano Mon, 16 Nov 2009 08:01:56 +0000 (00:01 -0800)

Merge branch 'js/maint-diff-color-words' into maint

* js/maint-diff-color-words:
diff --color-words: bit of clean-up
diff --color-words -U0: fix the location of hunk headers
t4034-diff-words: add a test for word diff without context

Conflicts:
diff.c

Merge branch 'tz/maint-rpm' into maintJunio C Hamano Mon, 16 Nov 2009 07:08:42 +0000 (23:08 -0800)

Merge branch 'tz/maint-rpm' into maint

* tz/maint-rpm:
Makefile: Ensure rpm packages can be read by older rpm versions

Merge branch 'jk/maint-format-patch-p-suppress-stat... Junio C Hamano Mon, 16 Nov 2009 07:07:49 +0000 (23:07 -0800)

Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint

* jk/maint-format-patch-p-suppress-stat:
format-patch: make "-p" suppress diffstat

Merge branch 'pb/maint-gitweb-blob-lineno' into maintJunio C Hamano Mon, 16 Nov 2009 07:07:38 +0000 (23:07 -0800)

Merge branch 'pb/maint-gitweb-blob-lineno' into maint

* pb/maint-gitweb-blob-lineno:
gitweb: Fix blob linenr links in pathinfo mode

Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano Mon, 16 Nov 2009 07:07:32 +0000 (23:07 -0800)

Merge branch 'jk/maint-1.6.3-ls-files-i' into maint

* jk/maint-1.6.3-ls-files-i:
ls-files: unbreak "ls-files -i"

Merge branch 'vl/maint-openssl-signature-change' into... Junio C Hamano Mon, 16 Nov 2009 07:07:27 +0000 (23:07 -0800)

Merge branch 'vl/maint-openssl-signature-change' into maint

* vl/maint-openssl-signature-change:
imap-send.c: fix compiler warnings for OpenSSL 1.0

Merge branch 'jk/maint-push-config' into maintJunio C Hamano Mon, 16 Nov 2009 07:07:17 +0000 (23:07 -0800)

Merge branch 'jk/maint-push-config' into maint

* jk/maint-push-config:
push: always load default config

Merge branch 'sr/blame-incomplete' into maintJunio C Hamano Mon, 16 Nov 2009 07:07:07 +0000 (23:07 -0800)

Merge branch 'sr/blame-incomplete' into maint

* sr/blame-incomplete:
blame: make sure that the last line ends in an LF

Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano Mon, 16 Nov 2009 07:06:34 +0000 (23:06 -0800)

Merge branch 'jc/maint-blank-at-eof' into maint

* jc/maint-blank-at-eof:
diff -B: colour whitespace errors
diff.c: emit_add_line() takes only the rest of the line
diff.c: split emit_line() from the first char and the rest of the line
diff.c: shuffling code around
diff --whitespace: fix blank lines at end
core.whitespace: split trailing-space into blank-at-{eol,eof}
diff --color: color blank-at-eof
diff --whitespace=warn/error: fix blank-at-eof check
diff --whitespace=warn/error: obey blank-at-eof
diff.c: the builtin_diff() deals with only two-file comparison
apply --whitespace: warn blank but not necessarily empty lines at EOF
apply --whitespace=warn/error: diagnose blank at EOF
apply.c: split check_whitespace() into two
apply --whitespace=fix: detect new blank lines at eof correctly
apply --whitespace=fix: fix handling of blank lines at the eof

git svn: attempt to create empty dirs on clone+rebaseEric Wong Mon, 16 Nov 2009 02:57:16 +0000 (18:57 -0800)

git svn: attempt to create empty dirs on clone+rebase

We parse unhandled.log files for empty_dir statements and make a
best effort attempt to recreate empty directories on fresh
clones and rebase. This should cover the majority of cases
where users work off a single branch or for projects where
branches do not differ in empty directories.

Since this cannot affect "normal" git commands like "checkout"
or "reset", so users switching between branches in a single
working directory should use the new "git svn mkdirs" command
after switching branches.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

Merge branch 'maint'Junio C Hamano Mon, 16 Nov 2009 00:41:42 +0000 (16:41 -0800)

Merge branch 'maint'

* maint:

Merge branch 'bs/maint-pre-commit-hook-sample'Junio C Hamano Mon, 16 Nov 2009 00:41:33 +0000 (16:41 -0800)

Merge branch 'bs/maint-pre-commit-hook-sample'

* bs/maint-pre-commit-hook-sample:
pre-commit.sample: Diff against the empty tree when HEAD is invalid

Merge branch 'js/maint-diff-color-words'Junio C Hamano Mon, 16 Nov 2009 00:41:29 +0000 (16:41 -0800)

Merge branch 'js/maint-diff-color-words'

* js/maint-diff-color-words:
diff --color-words: bit of clean-up
diff --color-words -U0: fix the location of hunk headers
t4034-diff-words: add a test for word diff without context

Conflicts:
diff.c

Merge branch 'rs/pretty-wrap'Junio C Hamano Mon, 16 Nov 2009 00:41:17 +0000 (16:41 -0800)

Merge branch 'rs/pretty-wrap'

* rs/pretty-wrap:
log --format: don't ignore %w() at the start of format string
Implement wrap format %w() as if it is a mode switch

Conflicts:
pretty.c

Merge branch 'js/log-rewrap'Junio C Hamano Mon, 16 Nov 2009 00:41:07 +0000 (16:41 -0800)

Merge branch 'js/log-rewrap'

* js/log-rewrap:
Teach --wrap to only indent without wrapping
Add strbuf_add_wrapped_text() to utf8.[ch]
print_wrapped_text(): allow hard newlines

Merge branch 'fc/doc-fast-forward'Junio C Hamano Mon, 16 Nov 2009 00:41:02 +0000 (16:41 -0800)

Merge branch 'fc/doc-fast-forward'

* fc/doc-fast-forward:
Use 'fast-forward' all over the place

Conflicts:
builtin-merge.c

Merge branch 'sc/difftool-p4merge'Junio C Hamano Mon, 16 Nov 2009 00:40:50 +0000 (16:40 -0800)

Merge branch 'sc/difftool-p4merge'

* sc/difftool-p4merge:
mergetool--lib: add p4merge as a pre-configured mergetool option

Merge branch 'jk/maint-add-p-empty'Junio C Hamano Mon, 16 Nov 2009 00:40:46 +0000 (16:40 -0800)

Merge branch 'jk/maint-add-p-empty'

* jk/maint-add-p-empty:
add-interactive: handle deletion of empty files

Merge branch 'lt/revision-bisect'Junio C Hamano Mon, 16 Nov 2009 00:40:39 +0000 (16:40 -0800)

Merge branch 'lt/revision-bisect'

* lt/revision-bisect:
Add '--bisect' revision machinery argument

Merge branch 'jc/maint-1.6.3-graft-trailing-space'... Junio C Hamano Mon, 16 Nov 2009 00:38:47 +0000 (16:38 -0800)

Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint

* jc/maint-1.6.3-graft-trailing-space:
info/grafts: allow trailing whitespaces at the end of line

Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano Mon, 16 Nov 2009 00:38:36 +0000 (16:38 -0800)

Merge branch 'tr/maint-roff-quote' into maint

* tr/maint-roff-quote:
Quote ' as \(aq in manpages

Merge branch 'ja/fetch-doc' into maintJunio C Hamano Mon, 16 Nov 2009 00:38:18 +0000 (16:38 -0800)

Merge branch 'ja/fetch-doc' into maint

* ja/fetch-doc:
Documentation/merge-options.txt: order options in alphabetical groups
Documentation/git-pull.txt: Add subtitles above included option files
Documentation/fetch-options.txt: order options alphabetically

Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano Mon, 16 Nov 2009 00:37:58 +0000 (16:37 -0800)

Merge branch 'cb/doc-fetch-pull-merge' into maint

* cb/doc-fetch-pull-merge:
modernize fetch/merge/pull examples

Merge branch 'jk/maint-cvsimport-pathname' into maintJunio C Hamano Mon, 16 Nov 2009 00:37:53 +0000 (16:37 -0800)

Merge branch 'jk/maint-cvsimport-pathname' into maint

* jk/maint-cvsimport-pathname:
cvsimport: fix relative argument filenames

Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano Mon, 16 Nov 2009 00:37:49 +0000 (16:37 -0800)

Merge branch 'jc/receive-pack-auto' into maint

* jc/receive-pack-auto:
receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
gc --auto --quiet: make the notice a bit less verboase

Merge branch 'gb/maint-gitweb-esc-param' into maintJunio C Hamano Mon, 16 Nov 2009 00:37:39 +0000 (16:37 -0800)

Merge branch 'gb/maint-gitweb-esc-param' into maint

* gb/maint-gitweb-esc-param:
gitweb: fix esc_param

Merge branch 'jn/gitweb-patch' into maintJunio C Hamano Mon, 16 Nov 2009 00:37:36 +0000 (16:37 -0800)

Merge branch 'jn/gitweb-patch' into maint

* jn/gitweb-patch:
gitweb: Do not show 'patch' link for merge commits

Merge branch 'maint'Junio C Hamano Sun, 15 Nov 2009 08:26:51 +0000 (00:26 -0800)

Merge branch 'maint'

* maint:
git-add.txt: fix formatting of --patch section

remote: fix use-after-free error detected by glibc... Julian Phillips Fri, 13 Nov 2009 21:25:56 +0000 (21:25 +0000)

remote: fix use-after-free error detected by glibc in ref_remove_duplicates

In ref_remove_duplicates, when we encounter a duplicate and remove it
from the list we need to make sure that the prev pointer stays
pointing at the last entry and also skip over adding the just freed
entry to the string_list.

Previously fetch could crash with:
*** glibc detected *** git: corrupted double-linked list: ...

Also add a test to try and catch problems with duplicate removal in
the future.

Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: Ensure rpm packages can be read by older... Todd Zullinger Wed, 11 Nov 2009 21:59:52 +0000 (16:59 -0500)

Makefile: Ensure rpm packages can be read by older rpm versions

The kernel.org hosts where the packages are built are now using Fedora
11, which defaults to sha256 for file digests instead of md5. Older
versions of rpm can not handle these packages. Tell rpmbuild to use md5
file digests for better compatibility.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash: add the merge option --ff-onlyBjörn Gustavsson Wed, 11 Nov 2009 04:49:07 +0000 (05:49 +0100)

bash: add the merge option --ff-only

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Make 'history' view (re)use git_log_generic()Jakub Narebski Fri, 13 Nov 2009 01:02:14 +0000 (02:02 +0100)

gitweb: Make 'history' view (re)use git_log_generic()

Make git_history use git_log_generic, passing git_history_body as one
of its paramaters. This required changes to git_log_generic, in
particular passing more things as parameters.

While refactoring common code of 'log', 'shortlog' and 'history' view,
we did unify pagination, using always the form used by 'history' view,
namely
first * prev * next
in place of
HEAD * prev * next
used by 'log' and 'shortlog' views.

The 'history' view now supports commit limiting via 'hpb' parameter,
similarly to 'shortlog' (and 'log') view. Performance of 'history'
view got improved a bit, as it doesn't run git_get_hash_by_path for
"current" version in a loop. Error detection and reporting for
'history' view changed a bit.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Refactor common parts of 'log' and 'shortlog... Jakub Narebski Fri, 13 Nov 2009 01:02:13 +0000 (02:02 +0100)

gitweb: Refactor common parts of 'log' and 'shortlog' views

Put the common parts of git_log and git_shortlog into git_log_generic
subroutine: git_log and git_shortlog are now thin wrappers calling
git_log_generic with appropriate arguments.

The unification of code responsible for 'log' and 'shorlog' actions
lead to the following changes in gitweb output
* 'tree' link in page_nav now uses $hash parameter, as was the case
for 'shortlog' but not for 'log'
* 'log' view now respect $hash_parent limiting, like 'shortlog' did
* 'log' view doesn't have special case for empty list anymore, and it
always uses page_header linking to summary view, like 'shortlog'
did.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Refactor 'log' action generation, adding git_lo... Jakub Narebski Fri, 13 Nov 2009 01:02:12 +0000 (02:02 +0100)

gitweb: Refactor 'log' action generation, adding git_log_body()

Put the main part of 'log' view generation into git_log_body,
similarly how it is done for 'shortlog' and 'history' views (and
also for 'tags' and 'heads' views).

This is preparation for extracting common code between 'log',
'shortlog' and 'history' actions.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git svn: add authorsfile test case for ~/.gitconfigEric Wong Sat, 14 Nov 2009 22:43:20 +0000 (14:43 -0800)

git svn: add authorsfile test case for ~/.gitconfig

The commit for:
git svn: read global+system config for clone+init

Initially lacked a test case because the author was unable to
reproduce it under his test environment, this adds it.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

git svn: read global+system config for clone+initEric Wong Sat, 14 Nov 2009 22:25:11 +0000 (14:25 -0800)

git svn: read global+system config for clone+init

Since $GIT_DIR does not exist when initializing new repositories,
we can follow back to the global and system config files for
git.

The logic for this was originally introduced when
$GIT_DIR/config was the only config file git could read (back
when "git config" was "git repo-config"), so the function is
renamed to "read_git_config" instead of "read_repo_config".

Signed-off-by: Eric Wong <normalperson@yhbt.net>

git svn: handle SVN merges from revisions past the... Toby Allsopp Sat, 14 Nov 2009 21:26:47 +0000 (13:26 -0800)

git svn: handle SVN merges from revisions past the tip of the branch

When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.

In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.

[ew: This includes the following (squashed) commit to prevent
errors during bisect:]

Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300

git-svn: add (failing) test for SVN 1.5+ merge with intervening commit

This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.

To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).

Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-add.txt: fix formatting of --patch sectionStephen Boyd Sat, 14 Nov 2009 01:45:46 +0000 (17:45 -0800)

git-add.txt: fix formatting of --patch section

Extra paragraphs should be prefixed with a plus sign.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

give priority to progress messagesNicolas Pitre Wed, 11 Nov 2009 22:24:42 +0000 (17:24 -0500)

give priority to progress messages

In theory it is possible for sideband channel #2 to be delayed if
pack data is quick to come up for sideband channel #1. And because
data for channel #2 is read only 128 bytes at a time while pack data
is read 8192 bytes at a time, it is possible for many pack blocks to
be sent to the client before the progress message fifo is emptied,
making the situation even worse. This would result in totally garbled
progress display on the client's console as local progress gets mixed
with partial remote progress lines.

Let's prevent such situations by giving transmission priority to
progress messages over pack data at all times.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 11 Nov 2009 04:45:38 +0000 (20:45 -0800)

Merge branch 'maint'

* maint:
check-ref-format -h: it does not know the --print option yet

... but it does on the 'master' branch.

check-ref-format -h: it does not know the --print optio... Junio C Hamano Wed, 11 Nov 2009 04:45:23 +0000 (20:45 -0800)

check-ref-format -h: it does not know the --print option yet

Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-describe.txt: formatting fixJunio C Hamano Tue, 10 Nov 2009 22:06:41 +0000 (14:06 -0800)

git-describe.txt: formatting fix

A multi-line SYNOPSIS description must be marked as [verse]

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Tue, 10 Nov 2009 20:36:26 +0000 (12:36 -0800)

Merge branch 'maint'

* maint:
merge: do not setup worktree twice
check-ref-format: update usage string

Conflicts:
builtin-check-ref-format.c

Merge branch 'jk/maint-format-patch-p-suppress-stat'Junio C Hamano Tue, 10 Nov 2009 20:35:56 +0000 (12:35 -0800)

Merge branch 'jk/maint-format-patch-p-suppress-stat'

* jk/maint-format-patch-p-suppress-stat:
format-patch: make "-p" suppress diffstat

Merge branch 'pb/maint-gitweb-blob-lineno'Junio C Hamano Tue, 10 Nov 2009 20:35:31 +0000 (12:35 -0800)

Merge branch 'pb/maint-gitweb-blob-lineno'

* pb/maint-gitweb-blob-lineno:
gitweb: Fix blob linenr links in pathinfo mode

Merge branch 'tr/describe-advice'Junio C Hamano Tue, 10 Nov 2009 20:35:08 +0000 (12:35 -0800)

Merge branch 'tr/describe-advice'

* tr/describe-advice:
describe: when failing, tell the user about options that work

Merge branch 'jk/maint-1.6.3-ls-files-i'Junio C Hamano Tue, 10 Nov 2009 20:33:28 +0000 (12:33 -0800)

Merge branch 'jk/maint-1.6.3-ls-files-i'

* jk/maint-1.6.3-ls-files-i:
ls-files: unbreak "ls-files -i"

Merge branch 'bg/merge-ff-only'Junio C Hamano Tue, 10 Nov 2009 20:32:59 +0000 (12:32 -0800)

Merge branch 'bg/merge-ff-only'

* bg/merge-ff-only:
Teach 'git merge' and 'git pull' the option --ff-only

Merge branch 'vl/maint-openssl-signature-change'Junio C Hamano Tue, 10 Nov 2009 20:32:18 +0000 (12:32 -0800)

Merge branch 'vl/maint-openssl-signature-change'

* vl/maint-openssl-signature-change:
imap-send.c: fix compiler warnings for OpenSSL 1.0

Merge branch 'jk/maint-push-config'Junio C Hamano Tue, 10 Nov 2009 20:31:42 +0000 (12:31 -0800)

Merge branch 'jk/maint-push-config'

* jk/maint-push-config:
push: always load default config

Merge branch 'jk/gitignore-anchored'Junio C Hamano Tue, 10 Nov 2009 20:31:11 +0000 (12:31 -0800)

Merge branch 'jk/gitignore-anchored'

* jk/gitignore-anchored:
gitignore: root most patterns at the top-level directory

Conflicts:
.gitignore

Merge branch 'jp/dirty-describe'Junio C Hamano Tue, 10 Nov 2009 20:30:43 +0000 (12:30 -0800)

Merge branch 'jp/dirty-describe'

* jp/dirty-describe:
Teach "git describe" --dirty option

Merge branch 'sr/blame-incomplete'Junio C Hamano Tue, 10 Nov 2009 20:29:53 +0000 (12:29 -0800)

Merge branch 'sr/blame-incomplete'

* sr/blame-incomplete:
blame: make sure that the last line ends in an LF

diff --no-index: make the usage string less scaryJonathan Nieder Mon, 9 Nov 2009 15:05:04 +0000 (09:05 -0600)

diff --no-index: make the usage string less scary

Start the diff --no-index usage string with "usage:" instead of
"fatal:".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-{recursive,subtree}: use usagef() to print usageJonathan Nieder Mon, 9 Nov 2009 15:05:03 +0000 (09:05 -0600)

merge-{recursive,subtree}: use usagef() to print usage

Usage messages (for example, from "git merge-recursive -h") are
friendlier when not preceded by "fatal".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Introduce usagef() that takes a printf-style formatJonathan Nieder Mon, 9 Nov 2009 15:05:02 +0000 (09:05 -0600)

Introduce usagef() that takes a printf-style format

Some new callers would want to use printf-like formatting, when issuing
their usage messages. An option is to change usage() itself also be like
printf(), which would make it similar to die() and warn().

But usage() is typically fixed, as opposed to die() and warn() that gives
diagnostics depending on the situation. Indeed, the majority of strings
given by existing callsites to usage() are fixed strings. If we were to
make usage() take printf-style format, they all need to be changed to have
"%s" as their first argument.

So instead, introduce usagef() so that limited number of callers can use
it.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Let 'git <command> -h' show usage without a git dirJonathan Nieder Mon, 9 Nov 2009 15:05:01 +0000 (09:05 -0600)

Let 'git <command> -h' show usage without a git dir

There is no need for "git <command> -h" to depend on being inside
a repository.

Reported by Gerfried Fuchs through http://bugs.debian.org/462557

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git http-push -h'Jonathan Nieder Mon, 9 Nov 2009 10:47:34 +0000 (04:47 -0600)

Show usage string for 'git http-push -h'

http-push already knows how to dump usage if it is given no options, but
it interprets '-h' as the URL to a remote repository:

$ git http-push -h
error: Cannot access URL -h/, return code 6

Dump usage instead. Humans wanting to pass the URL -h/ to curl for some
reason can use 'git http-push -h/' explicitly. Scripts expecting to
access an HTTP repository at URL '-h' will break, though.

Also delay finding a git directory until after option parsing, so
"http-push -h" can be used outside any git repository.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Let 'git http-fetch -h' show usage outside any git... Jonathan Nieder Mon, 9 Nov 2009 15:04:59 +0000 (09:04 -0600)

Let 'git http-fetch -h' show usage outside any git repository

Delay search for a git directory until option parsing has finished.
None of the functions used in option parsing look for or read any
files other than stdin, so this is safe.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jn/maint-http-fetch-mingw' into jn/help... Junio C Hamano Tue, 10 Nov 2009 19:10:14 +0000 (11:10 -0800)

Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere

* jn/maint-http-fetch-mingw:
http-fetch: add missing initialization of argv0_path
merge: do not setup worktree twice
check-ref-format: update usage string

Conflicts:
builtin-check-ref-format.c

Show usage string for 'git stripspace -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:57 +0000 (09:04 -0600)

Show usage string for 'git stripspace -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git unpack-file -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:56 +0000 (09:04 -0600)

Show usage string for 'git unpack-file -h'

"unpack-file -h" could be asking to save the contents of a blob
named "-h". Strictly speaking, such a pathological ref name is
possible, but the user would have to had said something like
"tags/-h" to name such a pathological ref already. When used in
scripts, unpack-file is typically not passed a user-supplied tag
name directly.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git show-index -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:55 +0000 (09:04 -0600)

Show usage string for 'git show-index -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git rev-parse -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:54 +0000 (09:04 -0600)

Show usage string for 'git rev-parse -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git merge-one-file -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:53 +0000 (09:04 -0600)

Show usage string for 'git merge-one-file -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git mailsplit -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:52 +0000 (09:04 -0600)

Show usage string for 'git mailsplit -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git imap-send -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:51 +0000 (09:04 -0600)

Show usage string for 'git imap-send -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git get-tar-commit-id -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:50 +0000 (09:04 -0600)

Show usage string for 'git get-tar-commit-id -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git fast-import -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:49 +0000 (09:04 -0600)

Show usage string for 'git fast-import -h'

Let "git fast-import -h" (with no other arguments) print usage
before exiting, even when run outside any repository.

Cc: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git check-ref-format -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:48 +0000 (09:04 -0600)

Show usage string for 'git check-ref-format -h'

This only changes the behavior of "git check-ref-format -h"
without any other options and arguments.

This change cannot be breaking backward compatibility, since any
valid refname must contain a /. Most existing scripts use
arguments such as "heads/$foo". If some script checks the
refname "-h" alone, git check-ref-format will still exit with
nonzero status, and the only detrimental side-effect will be a
usage string sent to stderr.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http-fetch: add missing initialization of argv0_pathJonathan Nieder Mon, 9 Nov 2009 15:05:00 +0000 (09:05 -0600)

http-fetch: add missing initialization of argv0_path

According to c6dfb39 (remote-curl: add missing initialization of
argv0_path, 2009-10-13), programs with "main" must call this to
work correctly on MinGW.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge: do not setup worktree twiceJonathan Nieder Mon, 9 Nov 2009 15:04:58 +0000 (09:04 -0600)

merge: do not setup worktree twice

Builtins do not need to run setup_worktree() for themselves, since
the builtin machinery runs it for them.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

check-ref-format: update usage stringJonathan Nieder Mon, 9 Nov 2009 15:04:47 +0000 (09:04 -0600)

check-ref-format: update usage string

'git check-ref-format' has learned --branch and --print options
since the usage string was last updated.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-update-index.txt: Document the --really-refresh... Štěpán Němec Tue, 10 Nov 2009 18:11:51 +0000 (19:11 +0100)

git-update-index.txt: Document the --really-refresh option.

Add the description next to --assume-unchanged because this option is only
useful in a special case of using that option.

Signed-off-by: Štěpán Němec <stepnem@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git show-ref -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:46 +0000 (09:04 -0600)

Show usage string for 'git show-ref -h'

This only changes the behavior of "git show-ref -h" without any
other options and arguments.

"show-ref -h" currently is short for "show-ref --head", which
shows all the refs/* and HEAD, as opposed to "show-ref" that
shows all the refs/* and not HEAD.

Does anybody use "show-ref -h"? It was in Linus's original, most
likely only because "it might be handy", not because "the command
should not show the HEAD by default for such and such reasons".
So I think it is okay if "show-ref -h" (but not "show-ref
--head") gives help and exits.

If a current script uses "git show-ref -h" without any other
arguments, it would have to be adapted by changing "-h" to
"--head".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git merge-ours -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:45 +0000 (09:04 -0600)

Show usage string for 'git merge-ours -h'

This change is strictly about 'git merge-ours -h' without
any other options and arguments.

This change cannot break compatibility since merge drivers are
always passed '--', among other arguments.

Any usage string for this command is a lie, since it ignored its
arguments until now. Still, it makes sense to let the user know
the expected usage when asked.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git commit-tree -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:44 +0000 (09:04 -0600)

Show usage string for 'git commit-tree -h'

Treat an "-h" option as a request for help, rather than a "Not a
valid object name" error.

"commit-tree -h" could be asking to create a new commit from a
treeish named "-h". Strictly speaking, such a pathological ref
name is possible, but the user would have to had said something
like "tags/-h" to name such a pathological already. commit-tree
is usually used in scripts with raw object ids, anyway.

For consistency, the "-h" option uses its new meaning even if
followed by other arguments.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git cherry -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:43 +0000 (09:04 -0600)

Show usage string for 'git cherry -h'

Treat an "-h" option as a request for help, rather than an
"Unknown commit -h" error.

"cherry -h" could be asking to compare histories that leads to
our HEAD and a commit that can be named as "-h". Strictly
speaking, that may be a valid refname, but the user would have to
say something like "tags/-h" to name such a pathological ref
already, so it is not such a big deal.

The "-h" option keeps its meaning even if preceded by other
options or followed by other arguments. This keeps the
command-line syntax closer to what parse_options would give and
supports shell aliases like 'alias cherry="git cherry -v"' a
little better.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Show usage string for 'git grep -h'Jonathan Nieder Mon, 9 Nov 2009 15:04:42 +0000 (09:04 -0600)

Show usage string for 'git grep -h'

Clarification: the following description only talks about "git
grep -h" without any other options and arguments.

Such a change cannot be breaking backward compatibility. "grep
-h" cannot be asking for suppressing filenames, as there is no
match pattern specified.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Retire fetch--tool helper to contrib/examplesJonathan Nieder Mon, 9 Nov 2009 15:04:41 +0000 (09:04 -0600)

Retire fetch--tool helper to contrib/examples

When git-fetch was builtin-ized, the previous script was moved to
contrib/examples. Now, it is the sole remaining user for
'git fetch--tool'.

The fetch--tool code is still worth keeping around so people can
try out the old git-fetch.sh, for example when investigating
regressions from the builtinifaction.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 9 Nov 2009 02:16:04 +0000 (18:16 -0800)

Merge branch 'maint'

* maint:
Add intermediate build products to .gitignore

Add intermediate build products to .gitignoreJonathan Nieder Sun, 8 Nov 2009 22:07:16 +0000 (16:07 -0600)

Add intermediate build products to .gitignore

Temporaries such as configure.ac+ and Documentation/*.xml+
sometimes remain after an interrupted build. Tell git not to
track them.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

format-patch: make "-p" suppress diffstatJeff King Wed, 4 Nov 2009 07:19:40 +0000 (02:19 -0500)

format-patch: make "-p" suppress diffstat

Once upon a time, format-patch would use its default stat
plus patch format only when no diff format was given on the
command line. This meant that "format-patch -p" would
suppress the stat and show just the patch.

Commit 68daa64 changed this to keep the stat format when we
had an "implicit" patch format, like "-U5". As a side
effect, this meant that an explicit patch format was now
ignored (because cmd_format_patch didn't know the reason
that the format was set way down in diff_opt_parse).

This patch unbreaks what 68daa64 did (while still preserving
what 68daa64 was trying to do), reinstating "-p" to suppress
the default behavior. We do this by parsing "-p" ourselves
in format-patch, and noting whether it was used explicitly.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

log --format: don't ignore %w() at the start of format... René Scharfe Sun, 8 Nov 2009 01:04:21 +0000 (02:04 +0100)

log --format: don't ignore %w() at the start of format string

This fixes e.g. --format='%w(72)%s'.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pre-commit.sample: Diff against the empty tree when... Björn Steinbrink Thu, 5 Nov 2009 10:57:57 +0000 (11:57 +0100)

pre-commit.sample: Diff against the empty tree when HEAD is invalid

This was already the case for the old "diff --check" call, but the new
one that checks whether there are any non-ascii file names was missing
it, making that check fail for root commits.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>