gitweb.git
t1510: setup case #26Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:25 +0000 (22:32 +0700)

t1510: setup case #26

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #25Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:24 +0000 (22:32 +0700)

t1510: setup case #25

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #24Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:23 +0000 (22:32 +0700)

t1510: setup case #24

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #23Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:22 +0000 (22:32 +0700)

t1510: setup case #23

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #22Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:21 +0000 (22:32 +0700)

t1510: setup case #22

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #21Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:20 +0000 (22:32 +0700)

t1510: setup case #21

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #20Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:19 +0000 (22:32 +0700)

t1510: setup case #20

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #19Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:18 +0000 (22:32 +0700)

t1510: setup case #19

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #18Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:17 +0000 (22:32 +0700)

t1510: setup case #18

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #17Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:16 +0000 (22:32 +0700)

t1510: setup case #17

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #16Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:15 +0000 (22:32 +0700)

t1510: setup case #16

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #15Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:14 +0000 (22:32 +0700)

t1510: setup case #15

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #14Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:13 +0000 (22:32 +0700)

t1510: setup case #14

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #13Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:12 +0000 (22:32 +0700)

t1510: setup case #13

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #12Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:11 +0000 (22:32 +0700)

t1510: setup case #12

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #11Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:10 +0000 (22:32 +0700)

t1510: setup case #11

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #10Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:09 +0000 (22:32 +0700)

t1510: setup case #10

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #9Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:08 +0000 (22:32 +0700)

t1510: setup case #9

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #8Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:07 +0000 (22:32 +0700)

t1510: setup case #8

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #7Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:06 +0000 (22:32 +0700)

t1510: setup case #7

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #6Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:05 +0000 (22:32 +0700)

t1510: setup case #6

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #5Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:04 +0000 (22:32 +0700)

t1510: setup case #5

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #4Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:03 +0000 (22:32 +0700)

t1510: setup case #4

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #3Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:02 +0000 (22:32 +0700)

t1510: setup case #3

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #2Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:01 +0000 (22:32 +0700)

t1510: setup case #2

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #1Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:32:00 +0000 (22:32 +0700)

t1510: setup case #1

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t1510: setup case #0Nguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:31:59 +0000 (22:31 +0700)

t1510: setup case #0

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add t1510 and basic rules that run repo setupNguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:31:58 +0000 (22:31 +0700)

Add t1510 and basic rules that run repo setup

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtins: print setup info if repo is foundNguyễn Thái Ngọc Duy Fri, 26 Nov 2010 15:31:57 +0000 (22:31 +0700)

builtins: print setup info if repo is found

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ab/send-email-perl'Junio C Hamano Wed, 27 Oct 2010 05:02:52 +0000 (22:02 -0700)

Merge branch 'ab/send-email-perl'

* ab/send-email-perl:
send-email: extract_valid_address use qr// regexes
send-email: is_rfc2047_quoted use qr// regexes
send-email: use Perl idioms in while loop
send-email: make_message_id use "require" instead of "use"
send-email: send_message die on $!, not $?
send-email: use (?:) instead of () if no match variables are needed
send-email: sanitize_address use qq["foo"], not "\"foo\""
send-email: sanitize_address use $foo, not "$foo"
send-email: use \E***\Q instead of \*\*\*
send-email: cleanup_compose_files doesn't need a prototype
send-email: unique_email_list doesn't need a prototype
send-email: file_declares_8bit_cte doesn't need a prototype
send-email: get_patch_subject doesn't need a prototype
send-email: use lexical filehandles during sending
send-email: use lexical filehandles for $compose
send-email: use lexical filehandle for opendir

Conflicts:
git-send-email.perl

Merge branch 'sb/send-email-use-to-from-input'Junio C Hamano Wed, 27 Oct 2010 05:02:03 +0000 (22:02 -0700)

Merge branch 'sb/send-email-use-to-from-input'

* sb/send-email-use-to-from-input:
send-email: Don't leak To: headers between patches
send-email: Use To: headers in patch files

Conflicts:
git-send-email.perl

Merge branch 'ab/require-perl-5.8'Junio C Hamano Wed, 27 Oct 2010 04:57:31 +0000 (21:57 -0700)

Merge branch 'ab/require-perl-5.8'

* ab/require-perl-5.8:
perl: use "use warnings" instead of -w
perl: bump the required Perl version to 5.8 from 5.6.[21]

Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano Wed, 27 Oct 2010 04:54:04 +0000 (21:54 -0700)

Merge branch 'kb/merge-recursive-rename-threshold'

* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold

Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt

Merge branch 'jp/send-email-to-cmd'Junio C Hamano Wed, 27 Oct 2010 04:52:26 +0000 (21:52 -0700)

Merge branch 'jp/send-email-to-cmd'

* jp/send-email-to-cmd:
git-send-email.perl: Add --to-cmd

Conflicts:
git-send-email.perl

Merge branch 'as/daemon-multi-listen'Junio C Hamano Wed, 27 Oct 2010 04:50:03 +0000 (21:50 -0700)

Merge branch 'as/daemon-multi-listen'

* as/daemon-multi-listen:
daemon: allow more than one host address given via --listen
daemon: add helper function named_sock_setup

Merge branch 'dm/mergetool-vimdiff'Junio C Hamano Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700)

Merge branch 'dm/mergetool-vimdiff'

* dm/mergetool-vimdiff:
mergetool-lib: make the three-way diff the default for vim/gvim
mergetool-lib: add a three-way diff view for vim/gvim
mergetool-lib: combine vimdiff and gvimdiff run blocks

Merge branch 'kf/post-receive-sample-hook'Junio C Hamano Wed, 27 Oct 2010 04:41:18 +0000 (21:41 -0700)

Merge branch 'kf/post-receive-sample-hook'

* kf/post-receive-sample-hook:
post-receive-email: ensure sent messages are not empty

Merge branch 'jf/merge-ignore-ws'Junio C Hamano Wed, 27 Oct 2010 04:40:54 +0000 (21:40 -0700)

Merge branch 'jf/merge-ignore-ws'

* jf/merge-ignore-ws:
merge-recursive: options to ignore whitespace changes
merge-recursive --patience
ll-merge: replace flag argument with options struct
merge-recursive: expose merge options for builtin merge

Merge branch 'ml/completion-zsh'Junio C Hamano Wed, 27 Oct 2010 04:39:03 +0000 (21:39 -0700)

Merge branch 'ml/completion-zsh'

* ml/completion-zsh:
completion: make compatible with zsh

Merge branch 'po/sendemail'Junio C Hamano Wed, 27 Oct 2010 04:37:54 +0000 (21:37 -0700)

Merge branch 'po/sendemail'

* po/sendemail:
New send-email option smtpserveroption.
Remove @smtp_host_parts variable as not used.
Minor indentation fix.

Merge branch 'en/tree-walk-optim'Junio C Hamano Wed, 27 Oct 2010 04:37:49 +0000 (21:37 -0700)

Merge branch 'en/tree-walk-optim'

* en/tree-walk-optim:
diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
tree_entry_interesting(): Make return value more specific
tree-walk: Correct bitrotted comment about tree_entry()
Document pre-condition for tree_entry_interesting

Merge branch 'maint'Junio C Hamano Tue, 26 Oct 2010 22:04:05 +0000 (15:04 -0700)

Merge branch 'maint'

* maint:
Fix copy-pasted comments related to tree diff handling.

Fix copy-pasted comments related to tree diff handling.Yann Dirson Sun, 24 Oct 2010 21:03:10 +0000 (23:03 +0200)

Fix copy-pasted comments related to tree diff handling.

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

Sync with 1.7.3.2Junio C Hamano Fri, 22 Oct 2010 00:16:04 +0000 (17:16 -0700)

Sync with 1.7.3.2

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

Git 1.7.3.2 v1.7.3.2Junio C Hamano Fri, 22 Oct 2010 00:14:32 +0000 (17:14 -0700)

Git 1.7.3.2

Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano Thu, 21 Oct 2010 23:26:42 +0000 (16:26 -0700)

Merge branch 'sn/doc-opt-notation' into maint

* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently

Merge branch 'mg/fix-build-remote-helpers' into maintJunio C Hamano Thu, 21 Oct 2010 23:26:38 +0000 (16:26 -0700)

Merge branch 'mg/fix-build-remote-helpers' into maint

* mg/fix-build-remote-helpers:
remote-helpers: build in platform independent directory

{cvs,svn}import: use the new 'git read-tree --empty'Thomas Rast Mon, 18 Oct 2010 13:11:25 +0000 (15:11 +0200)

{cvs,svn}import: use the new 'git read-tree --empty'

Since fb1bb96 (read-tree: deprecate syntax without tree-ish args,
2010-09-10) not passing --empty caused a spurious warning that was
shown to the user.

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

Merge branch 'maint'Junio C Hamano Tue, 19 Oct 2010 21:15:51 +0000 (14:15 -0700)

Merge branch 'maint'

* maint:
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors

t/t9001-send-email.sh: fix stderr redirection in 'Inval... Antonio Ospite Tue, 19 Oct 2010 09:50:39 +0000 (11:50 +0200)

t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Clarify and extend the "git diff" format documentationAndreas Gruenbacher Thu, 14 Oct 2010 10:53:11 +0000 (12:53 +0200)

Clarify and extend the "git diff" format documentation

Move the similarity and dissimilarity index header description closer to
where those extended headers are described.

Describe and/or clarify the format used for file modes, pathnames, and
the index header.

Document that all "old" files refer to the state before applying the
*entire* output, and all "new" files refer to the state thereafter.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-show-ref.txt: clarify the pattern matchingMichael J Gruber Mon, 18 Oct 2010 11:33:32 +0000 (13:33 +0200)

git-show-ref.txt: clarify the pattern matching

git-show-ref really does not do what one would expect under the name
pattern matching, so describe it.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

documentation: git-config minor cleanupsCliff Frey Mon, 18 Oct 2010 03:10:45 +0000 (20:10 -0700)

documentation: git-config minor cleanups

Change push.default's description to add hyphens between values and
descriptions to make the manpage easier to read. The html version is
readable either way.

Change status.showUntrackedFiles to make item descriptions be
sentences and to use the same asciidoc format as push.default. The
only visual change is the additions of "."

Signed-off-by: Cliff Frey <cliff@meraki.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update test script annotate-tests.sh to handle missing... Kevin Ballard Sat, 16 Oct 2010 11:09:20 +0000 (04:09 -0700)

Update test script annotate-tests.sh to handle missing/extra authors

The current script used by annotate-tests.sh (used by t8001 and t8002) fails
to emit a warning if any of the expected authors never show up in the output
or if authors that show up in the output were never specified as expected.
Update the script to fail in both of these scenarios.

Helped-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Thu, 14 Oct 2010 03:20:09 +0000 (20:20 -0700)

Merge branch 'maint'

* maint:
Better advice on using topic branches for kernel development
Documentation: update implicit "--no-index" behavior in "git diff"
Documentation: expand 'git diff' SEE ALSO section
Documentation: diff can compare blobs
Documentation: gitrevisions is in section 7
shell portability: no "export VAR=VAL"
CodingGuidelines: reword parameter expansion section
Documentation: update-index: -z applies also to --index-info
Documentation: No argument of ALLOC_GROW should have side-effects

Better advice on using topic branches for kernel develo... Luck, Tony Fri, 1 Oct 2010 18:57:52 +0000 (11:57 -0700)

Better advice on using topic branches for kernel development

Linus Torvalds wrote:
> The real problem is that maintainers often pick random - and not at
> all stable - points for their development to begin with. They just
> pick some random "this is where Linus -git tree is today", and do
> their development on top of that. THAT is the problem - they are
> unaware that there's some nasty bug in that version.

Maybe they do this because they read it in the Git user-manual.

Fix the manual to give them better guidance.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: update implicit "--no-index" behavior... Jonathan Nieder Mon, 11 Oct 2010 16:06:18 +0000 (11:06 -0500)

Documentation: update implicit "--no-index" behavior in "git diff"

Originally "--no-index" mode triggered for untracked files within the
tracked tree, but with v1.5.6-rc1~41 (Merge branch 'jc/diff-no-no-index,
2008-05-26) the command was fixed to only implicitly trigger when paths
outside the tracked tree are mentioned.

Reported-by: Yann Dirson <dirson@bertin.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: expand 'git diff' SEE ALSO sectionJonathan Nieder Mon, 11 Oct 2010 16:05:32 +0000 (11:05 -0500)

Documentation: expand 'git diff' SEE ALSO section

Point in many directions in the hope of helping the reader find what
is needed more quickly.

This commit also removes the summary attached to the SEE ALSO entry
for difftool, to avoid making the SEE ALSO list too verbose. If the
reader wants a summary of the commands referred to, she can always
look to the top of the named pages or to the table of contents on the
main git(1) page.

Suggested-by: Goswin von Brederlow <goswin-v-b@web.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: diff can compare blobsJonathan Nieder Mon, 11 Oct 2010 16:04:08 +0000 (11:04 -0500)

Documentation: diff can compare blobs

Meanwhile, there is no plumbing command to compare two blobs.
Strange.

Reported-by: Yann Dirson <dirson@bertin.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: gitrevisions is in section 7Jonathan Nieder Mon, 11 Oct 2010 16:03:32 +0000 (11:03 -0500)

Documentation: gitrevisions is in section 7

Fix references to gitrevisions(1) in the manual pages and HTML
documentation.

In practice, this will not matter much unless someone tries to use a
hard copy of the git reference manual.

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

fast-import: Allow filemodify to set the rootDavid Barr Sun, 10 Oct 2010 03:30:15 +0000 (14:30 +1100)

fast-import: Allow filemodify to set the root

v1.7.3-rc0~75^2 (Teach fast-import to import subtrees named by tree id,
2010-06-30) has a shortcoming - it doesn't allow the root to be set.
Extend this behaviour by allowing the root to be referenced as the
empty path, "".

For a command (like filter-branch --subdirectory-filter) that wants
to commit a lot of trees that already exist in the object db, writing
undeltified objects as loose files only to repack them later can
involve a significant amount of overhead.
(23% slow-down observed on Linux 2.6.35, worse on Mac OS X 10.6)

Fortunately we have fast-import (which is one of the only git commands
that will write to a pack directly) but there is not an advertised way
to tell fast-import to commit a given tree without unpacking it.

This patch changes that, by allowing

M 040000 <tree id> ""

as a filemodify line in a commit to reset to a particular tree without
any need to parse it. For example,

M 040000 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ""

is a synonym for the deleteall command and the fast-import equivalent of

git read-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904

Signed-off-by: David Barr <david.barr@cordelta.com>
Commit-message-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Tested-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

shell portability: no "export VAR=VAL"Junio C Hamano Wed, 13 Oct 2010 18:36:36 +0000 (11:36 -0700)

shell portability: no "export VAR=VAL"

It is more portable to say "VAR=VAL && export VAR" instead.

Noticed by Ævar.

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

CodingGuidelines: reword parameter expansion sectionJunio C Hamano Wed, 13 Oct 2010 18:15:14 +0000 (11:15 -0700)

CodingGuidelines: reword parameter expansion section

Group entries related to parameter substitutions together and avoid
using the word "regexp" to refer to the ${parameter/pattern/string}
substitution (banned), as the pattern there is a shell glob and not
a regular expression.

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

Documentation: update-index: -z applies also to --index... Bert Wesarg Fri, 8 Oct 2010 06:50:20 +0000 (08:50 +0200)

Documentation: update-index: -z applies also to --index-info

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Improve behavior for actionless path_info gitwe... Jakub Narebski Wed, 13 Oct 2010 11:35:20 +0000 (13:35 +0200)

gitweb: Improve behavior for actionless path_info gitweb URLs

Eli Barzilay noticed that

http://server/gitweb/project/<commit-sha1>

link goes to 'shortlog' view, while 'commit' view would be more
useful, but that 'shortlog' action is more apropriate for

http://server/gitweb/project/<commit-sha1>..<other-commit-sha1>

links.

Therefore for the case when we don't have either action, or filename,
or parent hash [base] in path_info-based URL, i.e. for

http://server/gitweb/project/<object-id>

link, instead of using 'shortlog' view we allow dispatch() subroutine
to detect type of object and use appropriate action (in most case it
would be either 'commit' action, or 'tag', or 'tree' for top
directory).

Requested-by: Eli Barzilay <eli@barzilay.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Tested-by: Eli Barzilay <eli@barzilay.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Fix bug in evaluate_path_infoJakub Narebski Wed, 13 Oct 2010 11:33:48 +0000 (13:33 +0200)

gitweb: Fix bug in evaluate_path_info

There was bug in parsing "project/:/file" and "project/:/" path_info
URLs, with implicit HEAD as 'hash_base'.

For such URLs the refname is empty, and before this fix regexp for
parsing path_info fragment assumed that it is always non-empty.

Refname cannot contain ':', as per 'git check-ref-format'.

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

gitweb: Fix test of highlighting support in t9500Jakub Narebski Wed, 13 Oct 2010 11:57:41 +0000 (13:57 +0200)

gitweb: Fix test of highlighting support in t9500

The commit 7ce896b (Enable highlight executable path as a
configuration option, 2010-09-21) forgot to update t9500 test.

While at it, describe highlight test better.

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

t5503: fix typoMichael J Gruber Fri, 8 Oct 2010 21:03:15 +0000 (23:03 +0200)

t5503: fix typo

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: No argument of ALLOC_GROW should have... Jonathan Nieder Fri, 8 Oct 2010 16:46:59 +0000 (11:46 -0500)

Documentation: No argument of ALLOC_GROW should have side-effects

The explanatory comment before the definition of ALLOC_GROW carefully
lists arguments that will be used more than once and thus cannot have
side-effects; a lazy reader might conclude that the arguments not
listed are used only once and side effects safe.

Correct it to list all three arguments, avoiding this confusion.

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

Fix {update,checkout}-index usage stringsŠtěpán Němec Fri, 8 Oct 2010 17:31:20 +0000 (19:31 +0200)

Fix {update,checkout}-index usage strings

The `<file>' argument is optional in both cases (the man pages are
already correct).

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

Put a space between `<' and argument in pack-objects... Štěpán Němec Fri, 8 Oct 2010 17:31:19 +0000 (19:31 +0200)

Put a space between `<' and argument in pack-objects usage string

This makes it cosistent with other places (including the
git-pack-objects(1) manpage itself) and avoids possible confusion (I,
for one, mistook `<object-list' for a `<object-list>' typo at first when
preparing this series).

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

Remove stray quotes in --pretty and --format documentationŠtěpán Němec Fri, 8 Oct 2010 17:31:18 +0000 (19:31 +0200)

Remove stray quotes in --pretty and --format documentation

Quotes (for emphasis) are used in option explanations, not the
headings.

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

Use parentheses and `...' where appropriateŠtěpán Němec Fri, 8 Oct 2010 17:31:17 +0000 (19:31 +0200)

Use parentheses and `...' where appropriate

Remove some stray usage of other bracket types and asterisks for the
same purpose.

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

Fix odd markup in --diff-filter documentationŠtěpán Němec Fri, 8 Oct 2010 18:40:32 +0000 (20:40 +0200)

Fix odd markup in --diff-filter documentation

Instead of using the regex-like bracket expression, use grouping to make
it more consistent with other similar places. The brackets now have the
same meaning as in other documentation (i.e., the argument is optional).

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

Use angles for placeholders consistentlyŠtěpán Němec Fri, 8 Oct 2010 17:31:15 +0000 (19:31 +0200)

Use angles for placeholders consistently

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

commit-tree: free commit message before exitingJonathan Nieder Sat, 2 Oct 2010 08:41:00 +0000 (03:41 -0500)

commit-tree: free commit message before exiting

This buffer is freed by the C runtime when commit-tree exits moments
later, but freeing it explicitly should make valgrind quieter.

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

Merge branch 'maint'Junio C Hamano Wed, 6 Oct 2010 20:49:45 +0000 (13:49 -0700)

Merge branch 'maint'

* maint:
t/t3415: use && where applicable.
SubmittingPatches: Document some extra tags used in commit messages

t/t3415: use && where applicable.Yann Dirson Fri, 1 Oct 2010 21:19:19 +0000 (23:19 +0200)

t/t3415: use && where applicable.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

SubmittingPatches: Document some extra tags used in... Ramkumar Ramachandra Sat, 2 Oct 2010 04:37:43 +0000 (10:07 +0530)

SubmittingPatches: Document some extra tags used in commit messages

Document the meanings of the tags "Reported-by:", "Acked-by:",
"Reviewed-by:" and "Tested-by:" clearly. Also mention that the user is
free to use any custom tags.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Liked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diffcore-pickaxe.c: a void function shouldn't try to... Brandon Casey Mon, 4 Oct 2010 22:51:48 +0000 (17:51 -0500)

diffcore-pickaxe.c: a void function shouldn't try to return something

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make test script t9157 executableJunio C Hamano Wed, 6 Oct 2010 19:13:20 +0000 (12:13 -0700)

Make test script t9157 executable

Fixes a buglet introduced by a3c75056d

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

Merge branch 'jk/repack-reuse-object'Junio C Hamano Wed, 6 Oct 2010 19:11:26 +0000 (12:11 -0700)

Merge branch 'jk/repack-reuse-object'

* jk/repack-reuse-object:
Documentation: pack.compression: explain how to recompress
repack: add -F flag to let user choose between --no-reuse-delta/object

Merge branch 'bc/fix-cherry-pick-root'Junio C Hamano Wed, 6 Oct 2010 19:11:20 +0000 (12:11 -0700)

Merge branch 'bc/fix-cherry-pick-root'

* bc/fix-cherry-pick-root:
builtin/revert.c: don't dereference a NULL pointer

Merge branch 'uk/fix-author-ident-sed-script'Junio C Hamano Wed, 6 Oct 2010 19:11:12 +0000 (12:11 -0700)

Merge branch 'uk/fix-author-ident-sed-script'

* uk/fix-author-ident-sed-script:
get_author_ident_from_commit(): remove useless quoting

Merge branch 'cw/gitweb-hilite-config'Junio C Hamano Wed, 6 Oct 2010 19:10:35 +0000 (12:10 -0700)

Merge branch 'cw/gitweb-hilite-config'

* cw/gitweb-hilite-config:
Enable highlight executable path as a configuration option

Merge branch 'ab/makefile-track-cc'Junio C Hamano Wed, 6 Oct 2010 19:10:29 +0000 (12:10 -0700)

Merge branch 'ab/makefile-track-cc'

* ab/makefile-track-cc:
Makefile: add CC to TRACK_CFLAGS

Merge branch 'mg/reset-doc'Junio C Hamano Wed, 6 Oct 2010 19:10:26 +0000 (12:10 -0700)

Merge branch 'mg/reset-doc'

* mg/reset-doc:
git-reset.txt: make modes description more consistent
git-reset.txt: point to git-checkout
git-reset.txt: use "working tree" consistently
git-reset.txt: reset --soft is not a no-op
git-reset.txt: reset does not change files in target
git-reset.txt: clarify branch vs. branch head

Merge branch 'maint'Junio C Hamano Wed, 6 Oct 2010 19:10:02 +0000 (12:10 -0700)

Merge branch 'maint'

* maint:
Documentation/git-clone: describe --mirror more verbosely
do not depend on signed integer overflow
work around buggy S_ISxxx(m) implementations
xdiff: cast arguments for ctype functions to unsigned char
init: plug tiny one-time memory leak
diffcore-pickaxe.c: remove unnecessary curly braces
t3020 (ls-files-error-unmatch): remove stray '1' from end of file
setup: make sure git dir path is in a permanent buffer
environment.c: remove unused variable
git-svn: fix processing of decorated commit hashes
git-svn: check_cherry_pick should exclude commits already in our history
Documentation/git-svn: discourage "noMetadata"

Merge branch 'work/pt/for-junio' of git://repo.or.cz... Junio C Hamano Tue, 5 Oct 2010 15:43:59 +0000 (08:43 -0700)

Merge branch 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit

* 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit:
Add MinGW-specific execv() override.
Fix Windows-specific macro redefinition warning.
Fix 'clone' failure at DOS root directory.
mingw: do not crash on open(NULL, ...)
git-am: fix detection of absolute paths for windows
Side-step MSYS-specific path "corruption" leading to t5560 failure.
Side-step sed line-ending "corruption" leading to t6038 failure.
Skip 'git archive --remote' test on msysGit
Do not strip CR when grepping HTTP headers.
Skip t1300.70 and 71 on msysGit.
merge-octopus: Work around environment issue on Windows
MinGW: Report errors when failing to launch the html browser.
MinGW: fix stat() and lstat() implementations for handling symlinks
MinGW: Add missing file mode bit defines
MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Martin Langhoff has a new e-mail addressJunio C Hamano Tue, 5 Oct 2010 19:44:08 +0000 (12:44 -0700)

Martin Langhoff has a new e-mail address

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

Documentation/git-clone: describe --mirror more verboselyUwe Kleine-König Mon, 4 Oct 2010 17:28:27 +0000 (19:28 +0200)

Documentation/git-clone: describe --mirror more verbosely

Some people in #linux-rt noticed that describing what "--mirror" option does
with "it mirrors" is way insufficient.

Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Darren 'Some People' Hart <darren@dvhart.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

do not depend on signed integer overflowErik Faye-Lund Tue, 5 Oct 2010 07:24:10 +0000 (09:24 +0200)

do not depend on signed integer overflow

Signed integer overflow is not defined in C, so do not depend on it.

This fixes a problem with GCC 4.4.0 and -O3 where the optimizer would
consider "consumed_bytes > consumed_bytes + bytes" as a constant
expression, and never execute the die()-call.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

work around buggy S_ISxxx(m) implementationsRené Scharfe Mon, 4 Oct 2010 10:53:11 +0000 (12:53 +0200)

work around buggy S_ISxxx(m) implementations

There are buggy implementations of S_ISxxx(m) macros on some platforms
(e.g. NetBSD). The issue is that NetBSD doesn't take care to wrap its
macro arguments in parentheses, so on Linux and sane systems we have
S_ISREG(m) defined as something like:

(((m) & S_IFMT) == S_IFREG)

But on NetBSD:

((m & _S_IFMT) == _S_IFREG)

Since a caller in builtin/diff.c called our macro as `S_IFREG | 0644'
this bug introduced a logic error on NetBSD, since the precedence of
bit-wise & is higher than | in C.

[jc: took change description from Ævar Arnfjörð Bjarmason's patch]

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

xdiff: cast arguments for ctype functions to unsigned... Jonathan Nieder Mon, 4 Oct 2010 09:09:17 +0000 (04:09 -0500)

xdiff: cast arguments for ctype functions to unsigned char

The ctype functions isspace(), isalnum(), et al take an integer
argument representing an unsigned character, or -1 for EOF. On
platforms with a signed char, it is unsafe to pass a char to them
without casting it to unsigned char first.

Most of git is already shielded against this by the ctype
implementation in git-compat-util.h, but xdiff, which uses libc
ctype.h, ought to be fixed.

Noticed-by: der Mouse <mouse@Rodents-Montreal.ORG>
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

init: plug tiny one-time memory leakJonathan Nieder Mon, 4 Oct 2010 04:34:27 +0000 (23:34 -0500)

init: plug tiny one-time memory leak

The buffer used to construct paths like ".git/objects/info" and
".git/objects/pack" is allocated on the heap and never freed.

So free it. While at it, factor out the relevant code into its own
function and rename the sha1_dir variable to object_directory (to
match the change in everyday usage after the renaming of
SHA1_FILE_DIRECTORY in v0.99~603^2~7, 2005).

Noticed by valgrind while setting up tests (in test-lib).

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

diffcore-pickaxe.c: remove unnecessary curly bracesBrandon Casey Mon, 4 Oct 2010 22:51:47 +0000 (17:51 -0500)

diffcore-pickaxe.c: remove unnecessary curly braces

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge early part of git-svn into maintJunio C Hamano Tue, 5 Oct 2010 15:36:10 +0000 (08:36 -0700)

Merge early part of git-svn into maint

* commit 'git-svn/master~1':
git-svn: fix processing of decorated commit hashes
git-svn: check_cherry_pick should exclude commits already in our history
Documentation/git-svn: discourage "noMetadata"

send-email: Don't leak To: headers between patchesStephen Boyd Mon, 4 Oct 2010 07:05:24 +0000 (00:05 -0700)

send-email: Don't leak To: headers between patches

If the first patch in a series has a To: header in the file and the
second patch in the series doesn't the address from the first patch will
be part of the To: addresses in the second patch. Fix this by treating the
to list like the cc list. Have an initial to list come from the command
line, user input and config options. Then build up a to list from each
patch and concatenate the two together before sending the patch. Finally,
reset the list after sending each patch so the To: headers from a patch
don't get used for the next one.

Reported-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t3020 (ls-files-error-unmatch): remove stray '1' from... Elijah Newren Sun, 3 Oct 2010 20:00:00 +0000 (14:00 -0600)

t3020 (ls-files-error-unmatch): remove stray '1' from end of file

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

setup: make sure git dir path is in a permanent bufferJonathan Nieder Sat, 2 Oct 2010 08:36:52 +0000 (03:36 -0500)

setup: make sure git dir path is in a permanent buffer

If setup_git_env() is run before the usual repository discovery
sequence and .git is a file with the text

gitdir: <path>

(with <path> any string) then the in-core git_dir variable is set to
the result of converting <path> to an absolute path using
make_absolute_path().

Unfortunately make_absolute_path() returns its result in a static
buffer that is overwritten by later calls. Such a call could cause
later accesses to git_dir (from git_pathdup(), for example) to read
the wrong path, leaving git very confused.

It is not obvious whether any existing code in git will trigger the
problem, but in any case, it is worth a few dozen bytes to copy the
return value from make_absolute_path() for some added peace of mind.

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