gitweb.git
Merge branch 'ar/maint-mksnpath' into HEADJunio C Hamano Mon, 27 Oct 2008 05:24:44 +0000 (22:24 -0700)

Merge branch 'ar/maint-mksnpath' into HEAD

* ar/maint-mksnpath:
Fix potentially dangerous uses of mkpath and git_path
Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
Add mksnpath which allows you to specify the output buffer

Fix potentially dangerous uses of mkpath and git_pathAlex Riesen Sun, 26 Oct 2008 22:08:52 +0000 (23:08 +0100)

Fix potentially dangerous uses of mkpath and git_path

Replace them with mksnpath/git_snpath and a local buffer
for the resulting string.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.cAlex Riesen Sun, 26 Oct 2008 22:07:24 +0000 (23:07 +0100)

Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c

Otherwise the function sometimes fail to resolve obviously correct
refnames, because the string data pointed to by "str" argument were
reused.

The change in dwim_log does not fix anything, just optimizes away
strcpy code as the path can be created directly in the available
buffer.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add mksnpath which allows you to specify the output... Alex Riesen Sun, 26 Oct 2008 21:59:13 +0000 (22:59 +0100)

Add mksnpath which allows you to specify the output buffer

This is just vsnprintf's but additionally calls cleanup_path() on the
result. To be used as alternatives to mkpath() where the buffer for the
created path may not be reused by subsequent calls of the same formatting
function.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Sun, 26 Oct 2008 23:21:08 +0000 (16:21 -0700)

Merge branch 'maint'

* maint:
add -p: warn if only binary changes present
git-archive: work in bare repos
git-svn: change dashed git-config to git config

add -p: warn if only binary changes presentThomas Rast Sun, 26 Oct 2008 19:37:06 +0000 (20:37 +0100)

add -p: warn if only binary changes present

Current 'git add -p' will say "No changes." if there are no changes to
text files, which can be confusing if there _are_ changes to binary
files. Add some code to distinguish the two cases, and give a
different message in the latter one.

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

git-archive: work in bare reposCharles Bailey Sat, 25 Oct 2008 15:38:14 +0000 (11:38 -0400)

git-archive: work in bare repos

This moves the call to git_config to a place where it doesn't break the
logic for using git archive in a bare repository but retains the fix to
make git archive respect core.autocrlf.

Tests are by René Scharfe.

Signed-off-by: Charles Bailey <charles@hashpling.org>
Tested-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

receive-pack: fix "borrowing from alternate object... Junio C Hamano Sun, 26 Oct 2008 18:07:18 +0000 (11:07 -0700)

receive-pack: fix "borrowing from alternate object store" implementation

In the alternate_object_database structure, ent->base[] is a buffer the
users can use to form pathnames to loose objects, and ent->name is a
pointer into that buffer (it points at one beyond ".git/objects/"). If
you get a call to add_refs_from_alternate() after somebody used the entry
(has_loose_object() has been called, for example), *ent->name would not be
NUL, and ent->base[] won't be the path to the object store.

This caller is expecting to read the path to the object store in ent->base[];
it needs to NUL terminate the buffer if it wants to.

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

git-daemon: set REMOTE_ADDR to client addressJoey Hess Fri, 24 Oct 2008 05:48:50 +0000 (01:48 -0400)

git-daemon: set REMOTE_ADDR to client address

This allows hooks like pre-receive to look at the client's IP
address.

Of course the IP address can't be used to get strong security;
git-daemon isn't the right thing to use if you need that. However,
basic IP address checking can be good enough in some situations.

REMOTE_ADDR is the same environment variable used to communicate the
client's address to CGI scripts.

Signed-off-by: Joey Hess <joey@kitenet.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: change dashed git-config to git configDeskin Miller Thu, 23 Oct 2008 19:21:34 +0000 (15:21 -0400)

git-svn: change dashed git-config to git config

Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: fix some non-portable grep invocationsJeff King Wed, 22 Oct 2008 19:22:53 +0000 (15:22 -0400)

submodule: fix some non-portable grep invocations

Not all greps support "-e", but in this case we can easily convert it to a
single extended regex.

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

git-remote: list branches in vertical listsJohannes Sixt Wed, 22 Oct 2008 07:39:47 +0000 (09:39 +0200)

git-remote: list branches in vertical lists

Previously, branches were listed on a single line in each section. But
if there are many branches, then horizontal, line-wrapped lists are very
inconvenient to scan for a human. This makes the lists vertical, i.e one
branch per line is printed.

Since "git remote" is porcelain, we can easily make this
backwards-incompatible change.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rm: loosen safety valve for empty filesJeff King Tue, 21 Oct 2008 13:54:19 +0000 (09:54 -0400)

rm: loosen safety valve for empty files

If a file is different between the working tree copy, the index, and the
HEAD, then we do not allow it to be deleted without --force.

However, this is overly tight in the face of "git add --intent-to-add":

$ git add --intent-to-add file
$ : oops, I don't actually want to stage that yet
$ git rm --cached file
error: 'empty' has staged content different from both the
file and the HEAD (use -f to force removal)
$ git rm -f --cached file

Unfortunately, there is currently no way to distinguish between an empty
file that has been added and an "intent to add" file. The ideal behavior
would be to disallow the former while allowing the latter.

This patch loosens the safety valve to allow the deletion only if we are
deleting the cached entry and the cached content is empty. This covers
the intent-to-add situation, and assumes there is little harm in not
protecting users who have legitimately added an empty file. In many
cases, the file will still be empty, in which case the safety valve does
not trigger anyway (since the content remains untouched in the working
tree). Otherwise, we do remove the fact that no content was staged, but
given that the content is by definition empty, it is not terribly
difficult for a user to recreate it.

However, we still document the desired behavior in the form of two
tests. One checks the correct removal of an intent-to-add file. The other
checks that we still disallow removal of empty files, but is marked as
expect_failure to indicate this compromise. If the intent-to-add feature
is ever extended to differentiate between normal empty files and
intent-to-add files, then the safety valve can be re-tightened.

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

Merge branch 'jk/diff-convfilter'Junio C Hamano Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700)

Merge branch 'jk/diff-convfilter'

* jk/diff-convfilter:
diff: add filter for converting binary to text
diff: introduce diff.<driver>.binary
diff: unify external diff and funcname parsing code
t4012: use test_cmp instead of cmp

Merge branch 'js/maint-fetch-update-head'Junio C Hamano Wed, 22 Oct 2008 00:58:21 +0000 (17:58 -0700)

Merge branch 'js/maint-fetch-update-head'

* js/maint-fetch-update-head:
pull: allow "git pull origin $something:$current_branch" into an unborn branch
Fix fetch/pull when run without --update-head-ok

Conflicts:
t/t5510-fetch.sh

Merge branch 'jc/maint-co-track'Junio C Hamano Wed, 22 Oct 2008 00:58:11 +0000 (17:58 -0700)

Merge branch 'jc/maint-co-track'

* jc/maint-co-track:
Enhance hold_lock_file_for_{update,append}() API
demonstrate breakage of detached checkout with symbolic link HEAD
Fix "checkout --track -b newbranch" on detached HEAD

Conflicts:
builtin-commit.c

Merge branch 'rs/alloc-ref'Junio C Hamano Wed, 22 Oct 2008 00:58:01 +0000 (17:58 -0700)

Merge branch 'rs/alloc-ref'

* rs/alloc-ref:
make alloc_ref_from_str() the new alloc_ref()
use alloc_ref_from_str() everywhere
add alloc_ref_with_prefix()

Merge branch 'jk/fix-ls-files-other'Junio C Hamano Wed, 22 Oct 2008 00:57:56 +0000 (17:57 -0700)

Merge branch 'jk/fix-ls-files-other'

* jk/fix-ls-files-other:
refactor handling of "other" files in ls-files and status

Merge branch 'jc/maint-reset-remove-unmerged-new'Junio C Hamano Tue, 21 Oct 2008 20:48:41 +0000 (13:48 -0700)

Merge branch 'jc/maint-reset-remove-unmerged-new'

* jc/maint-reset-remove-unmerged-new:
reset --hard/read-tree --reset -u: remove unmerged new paths

Merge branch 'maint'Junio C Hamano Tue, 21 Oct 2008 20:47:22 +0000 (13:47 -0700)

Merge branch 'maint'

* maint:
GIT 1.6.0.3
rehabilitate 'git index-pack' inside the object store

GIT 1.6.0.3 v1.6.0.3Junio C Hamano Tue, 21 Oct 2008 20:37:42 +0000 (13:37 -0700)

GIT 1.6.0.3

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

rehabilitate 'git index-pack' inside the object storeNicolas Pitre Tue, 21 Oct 2008 01:17:07 +0000 (21:17 -0400)

rehabilitate 'git index-pack' inside the object store

Before commit d0b92a3f6e it was possible to run 'git index-pack'
directly in the .git/objects/pack/ directory. Restore that ability.

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

Merge branch 'maint'Junio C Hamano Tue, 21 Oct 2008 06:40:21 +0000 (23:40 -0700)

Merge branch 'maint'

* maint:
Fix testcase failure when extended attributes are in use

workflows documentation: fix link to git-request-pull[1]Lee Marlow Mon, 20 Oct 2008 17:35:31 +0000 (11:35 -0600)

workflows documentation: fix link to git-request-pull[1]

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

bash completion: Add 'workflows' to 'git help'Lee Marlow Mon, 20 Oct 2008 17:31:38 +0000 (11:31 -0600)

bash completion: Add 'workflows' to 'git help'

Completion for new workflow documentation introduced in f948dd8

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Tue, 21 Oct 2008 05:16:09 +0000 (22:16 -0700)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Turn short SHA1 names into links too
gitk: Regenerate .po files
gitk: New way of constructing menus that allows for Alt+letter accelerators
gitk: Bind Key-Return to create on new branch dialog
gitk: Fix binding for <Return> in sha1 entry field
gitk: Clean up file encoding code and add enable/disable option
gitk: Implement batch lookup and caching of encoding attrs
gitk: Enhance file encoding support
gitk: Add untranslated error messages to translation
gitk: Fix a bug in collapsing deeply nested trees
gitk: Use <Button-2> for context menus on OSX

document "intent to add" option to git-addJeff King Tue, 21 Oct 2008 00:36:25 +0000 (20:36 -0400)

document "intent to add" option to git-add

This was added by 3942581 but never documented.

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

gitk: Turn short SHA1 names into links tooPaul Mackerras Mon, 20 Oct 2008 23:18:12 +0000 (10:18 +1100)

gitk: Turn short SHA1 names into links too

This changes the link detection logic to accept strings of between 6
and 40 hex characters as a possible SHA1 ID of another commit, rather
than insisting on seeing the full 40 hex characters.

To make the logic that turns a possible link into an actual link work
with abbreviated IDs, this changes the way the commitinterest array is
used, and puts the code that deals with it in a pair of new functions.
The commitinterest array is now indexed by just the first 4 characters
of the interesting SHA1 ID, and each element is a list of id + command
pairs. This also pulls out the logic for expanding an abbreviated
SHA1 to the list of matching full IDs into its own function (the way
it is done is still the same slow way it was done before, which should
be improved some day).

This also fixes the bug where clicking on a link would take you to the
wrong commit if the line number of the target had changed since the
link was made.

This is based on a patch by Linus Torvalds, but totally rewritten by me.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Fix testcase failure when extended attributes are in useJunio C Hamano Mon, 20 Oct 2008 05:51:17 +0000 (22:51 -0700)

Fix testcase failure when extended attributes are in use

06cbe855 (Make core.sharedRepository more generic, 2008-04-16) made
several testcases in t1301-shared-repo.sh which fail if on a system
which creates files with extended attributes (e.g. SELinux), since ls
appends a '+' sign to the permission set in such cases. In fact,
POSIX.1 allows ls to add a single printable character after the usual
3x3 permission bits to show that an optional alternate/additional access
method is associated with the path.

This fixes the testcase to strip any such sign prior to verifying the
permission set.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Deskin Miller <deskinm@umich.edu>

Merge branch 'sh/maint-rebase3'Junio C Hamano Sun, 19 Oct 2008 23:07:29 +0000 (16:07 -0700)

Merge branch 'sh/maint-rebase3'

* sh/maint-rebase3:
rebase--interactive: fix parent rewriting for dropped commits

Merge branch 'tr/workflow-doc'Junio C Hamano Sun, 19 Oct 2008 23:07:23 +0000 (16:07 -0700)

Merge branch 'tr/workflow-doc'

* tr/workflow-doc:
Documentation: add manpage about workflows
Documentation: Refer to git-rebase(1) to warn against rewriting
Documentation: new upstream rebase recovery section in git-rebase

Merge branch 'mv/clonev'Junio C Hamano Sun, 19 Oct 2008 23:07:07 +0000 (16:07 -0700)

Merge branch 'mv/clonev'

* mv/clonev:
Implement git clone -v

Merge branch 'ml/cygwin-filemode'Junio C Hamano Sun, 19 Oct 2008 23:07:02 +0000 (16:07 -0700)

Merge branch 'ml/cygwin-filemode'

* ml/cygwin-filemode:
compat/cygwin.c - Use cygwin's stat if core.filemode == true

Merge branch 'gb/refactor-pathinfo'Junio C Hamano Sun, 19 Oct 2008 23:06:53 +0000 (16:06 -0700)

Merge branch 'gb/refactor-pathinfo'

* gb/refactor-pathinfo:
gitweb: refactor input parameters parse/validation

Merge branch 'dp/checkattr'Junio C Hamano Sun, 19 Oct 2008 23:06:47 +0000 (16:06 -0700)

Merge branch 'dp/checkattr'

* dp/checkattr:
git-check-attr(1): use 'verse' for multi-line synopsis sections
check-attr: Add --stdin option
check-attr: add an internal check_attr() function

Merge branch 'gb/formatpatch-autonbr'Junio C Hamano Sun, 19 Oct 2008 23:06:44 +0000 (16:06 -0700)

Merge branch 'gb/formatpatch-autonbr'

* gb/formatpatch-autonbr:
format-patch: autonumber by default

Merge branch 'sp/describe-lwtag'Junio C Hamano Sun, 19 Oct 2008 23:06:39 +0000 (16:06 -0700)

Merge branch 'sp/describe-lwtag'

* sp/describe-lwtag:
describe: Make --tags and --all match lightweight tags more often

Merge branch 'ae/preservemerge'Junio C Hamano Sun, 19 Oct 2008 23:06:31 +0000 (16:06 -0700)

Merge branch 'ae/preservemerge'

* ae/preservemerge:
rebase: Support preserving merges in non-interactive mode

Merge branch 'mv/merge-noff'Junio C Hamano Sun, 19 Oct 2008 23:06:21 +0000 (16:06 -0700)

Merge branch 'mv/merge-noff'

* mv/merge-noff:
builtin-commit: use reduce_heads() only when appropriate

Conflicts:
builtin-commit.c
t/t7600-merge.sh

Merge branch 'ns/rebase-noverify'Junio C Hamano Sun, 19 Oct 2008 23:05:58 +0000 (16:05 -0700)

Merge branch 'ns/rebase-noverify'

* ns/rebase-noverify:
rebase: Document --no-verify option to bypass pre-rebase hook
rebase --no-verify

Merge branch 'maint'Junio C Hamano Sun, 19 Oct 2008 22:53:46 +0000 (15:53 -0700)

Merge branch 'maint'

* maint:
Documentation: Clarify '--signoff' for git-commit

Fix mismerge at cdb22c4 in builtin-checkout.cJunio C Hamano Sun, 19 Oct 2008 22:32:35 +0000 (15:32 -0700)

Fix mismerge at cdb22c4 in builtin-checkout.c

The code to complain when -b is not given but an explicit --track/--no-track
override was given from the command line was unchanged on one branch and
reworked on the other branch. The merge result incorrectly kept it.

Spotted by Matt McCutchen.

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

git-merge-recursive: honor merge.conflictstyle once... Matt McCutchen Sun, 19 Oct 2008 00:40:50 +0000 (20:40 -0400)

git-merge-recursive: honor merge.conflictstyle once again

This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: add manpage about workflowsThomas Rast Sun, 19 Oct 2008 15:20:21 +0000 (17:20 +0200)

Documentation: add manpage about workflows

This attempts to make a manpage about workflows that is both handy to
point people at it and as a beginner's introduction.

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

Documentation: Spelling fixFredrik Skolmli Sun, 19 Oct 2008 16:09:43 +0000 (18:09 +0200)

Documentation: Spelling fix

Signed-off-by: Fredrik Skolmli <fredrik@frsk.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'pb/rename-rowin32'Junio C Hamano Sun, 19 Oct 2008 19:38:50 +0000 (12:38 -0700)

Merge branch 'pb/rename-rowin32'

* pb/rename-rowin32:
Do not rename read-only files during a push

Looks-fine-to-me-by: Shawn O. Pearce <spearce@spearce.org>
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>

Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano Fri, 17 Oct 2008 22:44:39 +0000 (15:44 -0700)

Enhance hold_lock_file_for_{update,append}() API

This changes the "die_on_error" boolean parameter to a mere "flags", and
changes the existing callers of hold_lock_file_for_update/append()
functions to pass LOCK_DIE_ON_ERROR.

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

demonstrate breakage of detached checkout with symbolic... Junio C Hamano Fri, 17 Oct 2008 22:56:11 +0000 (15:56 -0700)

demonstrate breakage of detached checkout with symbolic link HEAD

When core.prefersymlinkrefs is in use, detaching the HEAD by
checkout incorrectly clobbers the tip of the current branch.

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

Documentation: Clarify '--signoff' for git-commitAbhijit Bhopatkar Sun, 19 Oct 2008 04:19:23 +0000 (09:49 +0530)

Documentation: Clarify '--signoff' for git-commit

'--signoff' uses commiter name always to add the signoff line,
make it explicit in the documentation.

Signed-off-by: Abhijit Bhopatkar <bain@devslashzero.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

reset --hard/read-tree --reset -u: remove unmerged... Junio C Hamano Wed, 15 Oct 2008 23:00:06 +0000 (16:00 -0700)

reset --hard/read-tree --reset -u: remove unmerged new paths

When aborting a failed merge that has brought in a new path using "git
reset --hard" or "git read-tree --reset -u", we used to first forget about
the new path (via read_cache_unmerged) and then matched the working tree
to what is recorded in the index, thus ending up leaving the new path in
the work tree.

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

Update draft release notes for 1.6.1Junio C Hamano Sat, 18 Oct 2008 15:30:39 +0000 (08:30 -0700)

Update draft release notes for 1.6.1

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

Merge branch 'maint'Junio C Hamano Sat, 18 Oct 2008 15:26:44 +0000 (08:26 -0700)

Merge branch 'maint'

* maint:
Hopefully the final draft release notes update before 1.6.0.3
diff(1): clarify what "T"ypechange status means
contrib: update packinfo.pl to not use dashed commands
force_object_loose: Fix memory leak
tests: shell negation portability fix

Hopefully the final draft release notes update before... Junio C Hamano Sat, 18 Oct 2008 15:26:39 +0000 (08:26 -0700)

Hopefully the final draft release notes update before 1.6.0.3

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

diff(1): clarify what "T"ypechange status meansJunio C Hamano Sat, 18 Oct 2008 15:20:51 +0000 (08:20 -0700)

diff(1): clarify what "T"ypechange status means

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

Merge branch 'db/maint-checkout-b' into maintJunio C Hamano Sat, 18 Oct 2008 15:18:11 +0000 (08:18 -0700)

Merge branch 'db/maint-checkout-b' into maint

* db/maint-checkout-b:
Check early that a new branch is new and valid

diff: add filter for converting binary to textJeff King Sun, 5 Oct 2008 21:43:45 +0000 (17:43 -0400)

diff: add filter for converting binary to text

When diffing binary files, it is sometimes nice to see the
differences of a canonical text form rather than either a
binary patch or simply "binary files differ."

Until now, the only option for doing this was to define an
external diff command to perform the diff. This was a lot of
work, since the external command needed to take care of
doing the diff itself (including mode changes), and lost the
benefit of git's colorization and other options.

This patch adds a text conversion option, which converts a
file to its canonical format before performing the diff.
This is less flexible than an arbitrary external diff, but
is much less work to set up. For example:

$ echo '*.jpg diff=exif' >>.gitattributes
$ git config diff.exif.textconv exiftool
$ git config diff.exif.binary false

allows one to see jpg diffs represented by the text output
of exiftool.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff: introduce diff.<driver>.binaryJeff King Sun, 5 Oct 2008 21:43:36 +0000 (17:43 -0400)

diff: introduce diff.<driver>.binary

The "diff" gitattribute is somewhat overloaded right now. It
can say one of three things:

1. this file is definitely binary, or definitely not
(i.e., diff or !diff)
2. this file should use an external diff engine (i.e.,
diff=foo, diff.foo.command = custom-script)
3. this file should use particular funcname patterns
(i.e., diff=foo, diff.foo.(x?)funcname = some-regex)

Most of the time, there is no conflict between these uses,
since using one implies that the other is irrelevant (e.g.,
an external diff engine will decide for itself whether the
file is binary).

However, there is at least one conflicting situation: there
is no way to say "use the regular rules to determine whether
this file is binary, but if we do diff it textually, use
this funcname pattern." That is, currently setting diff=foo
indicates that the file is definitely text.

This patch introduces a "binary" config option for a diff
driver, so that one can explicitly set diff.foo.binary. We
default this value to "don't know". That is, setting a diff
attribute to "foo" and using "diff.foo.funcname" will have
no effect on the binaryness of a file. To get the current
behavior, one can set diff.foo.binary to true.

This patch also has one additional advantage: it cleans up
the interface to the userdiff code a bit. Before, calling
code had to know more about whether attributes were false,
true, or unset to determine binaryness. Now that binaryness
is a property of a driver, we can represent these situations
just by passing back a driver struct.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff: unify external diff and funcname parsing codeJeff King Sun, 5 Oct 2008 21:43:21 +0000 (17:43 -0400)

diff: unify external diff and funcname parsing code

Both sets of code assume that one specifies a diff profile
as a gitattribute via the "diff=foo" attribute. They then
pull information about that profile from the config as
diff.foo.*.

The code for each is currently completely separate from the
other, which has several disadvantages:

- there is duplication as we maintain code to create and
search the separate lists of external drivers and
funcname patterns

- it is difficult to add new profile options, since it is
unclear where they should go

- the code is difficult to follow, as we rely on the
"check if this file is binary" code to find the funcname
pattern as a side effect. This is the first step in
refactoring the binary-checking code.

This patch factors out these diff profiles into "userdiff"
drivers. A file with "diff=foo" uses the "foo" driver, which
is specified by a single struct.

Note that one major difference between the two pieces of
code is that the funcname patterns are always loaded,
whereas external drivers are loaded only for the "git diff"
porcelain; the new code takes care to retain that situation.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

t4012: use test_cmp instead of cmpJeff King Sun, 5 Oct 2008 21:42:35 +0000 (17:42 -0400)

t4012: use test_cmp instead of cmp

This makes erroneous output slightly easier to see. We also
flip the argument order to match our usual style.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

format-patch: autonumber by defaultBrian Gernhardt Thu, 2 Oct 2008 20:55:39 +0000 (16:55 -0400)

format-patch: autonumber by default

format-patch is most commonly used for multiple patches at once when
sending a patchset, in which case we want to number the patches; on
the other hand, single patches are not usually expected to be
numbered.

In other words, the typical behavior expected from format-patch is the
one obtained by enabling autonumber, so we set it to be the default.

Users that want to disable numbering for a particular patchset can do
so with the existing -N command-line switch. Users that want to
change the default behavior can use the format.numbering config key.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Test-updates-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Do not rename read-only files during a pushPetr Baudis Fri, 3 Oct 2008 10:20:43 +0000 (12:20 +0200)

Do not rename read-only files during a push

Win32 does not allow renaming read-only files (at least on a Samba
share), making push into a local directory to fail. Thus, defer
the chmod() call in index-pack.c:final() only after
move_temp_to_file() was called.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge branch 'pb/commit-where'Junio C Hamano Sat, 18 Oct 2008 14:07:23 +0000 (07:07 -0700)

Merge branch 'pb/commit-where'

* pb/commit-where:
tutorial: update output of git commit
reformat informational commit message
git commit: Reformat output somewhat
builtin-commit.c: show on which branch a commit was added

make alloc_ref_from_str() the new alloc_ref()René Scharfe Sat, 18 Oct 2008 08:44:18 +0000 (10:44 +0200)

make alloc_ref_from_str() the new alloc_ref()

With all calls to alloc_ref() gone, we can remove it and then we're free
to give alloc_ref_from_str() the shorter name. It's a much nicer
interface, as the callers always need to have a name string when they
allocate a ref anyway and don't need to calculate and pass its length+1
any more.

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

use alloc_ref_from_str() everywhereRené Scharfe Sat, 18 Oct 2008 08:41:33 +0000 (10:41 +0200)

use alloc_ref_from_str() everywhere

Replace pairs of alloc_ref() and strcpy() with alloc_ref_from_str(),
simplifying the code.

In connect.c, also a pair of alloc_ref() and memcpy() is replaced --
the additional cost of a strlen() call should not have too much of an
impact. Consistency and simplicity are more important.

In remote.c, the code was allocating 11 bytes more than needed for
the name part, but I couldn't see them being used for anything.

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

add alloc_ref_with_prefix()René Scharfe Sat, 18 Oct 2008 08:37:40 +0000 (10:37 +0200)

add alloc_ref_with_prefix()

In three cases in remote.c, a "raw" ref is allocated using alloc_ref()
and then its is constructed using sprintf(). Clean it up by adding a
helper function, alloc_ref_with_prefix(), which creates a composite
name. Use it in alloc_ref_from_str(), too, as it simplifies the code.

Open code alloc_ref() in alloc_ref_with_prefix(), as the former is
going to be removed in the patch after the next.

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

contrib: update packinfo.pl to not use dashed commandsDan McGee Sat, 18 Oct 2008 02:41:18 +0000 (21:41 -0500)

contrib: update packinfo.pl to not use dashed commands

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

force_object_loose: Fix memory leakBjörn Steinbrink Sat, 18 Oct 2008 00:37:31 +0000 (02:37 +0200)

force_object_loose: Fix memory leak

read_packed_sha1 expectes its caller to free the buffer it returns, which
force_object_loose didn't do.

This leak is eventually triggered by "git gc", when it is manually invoked
or there are too many packs around, making gc totally unusable when there
are lots of unreachable objects.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitk: Regenerate .po filesPaul Mackerras Sat, 18 Oct 2008 05:24:46 +0000 (16:24 +1100)

gitk: Regenerate .po files

This is the result of running make update-po and removing or fixing
the strings that were fuzzily matched. The ones that were fixed were
the ones where the only change was "git rev-list" to "git log", and
the "about gitk" message where the copyright year got updated.

To get xgettext to see the menu labels as needing translation, it
was necessary for arrange for them to be preceded by "mc". This
therefore changes makemenu to ignore the first element in each
menu item so that it can be "mc" in the makemenu call.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Fix "checkout --track -b newbranch" on detached HEADJunio C Hamano Fri, 17 Oct 2008 06:37:44 +0000 (23:37 -0700)

Fix "checkout --track -b newbranch" on detached HEAD

The test to make sure that checkout fails when --track was asked for and
we cannot set up tracking information in t7201 was wrong, and it turns out
that the implementation for that feature itself was buggy. This fixes it.

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

Merge branch 'jk/maint-ls-files-other' into jk/fix... Junio C Hamano Fri, 17 Oct 2008 20:03:52 +0000 (13:03 -0700)

Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other

* jk/maint-ls-files-other:
refactor handling of "other" files in ls-files and status

Conflicts:
read-cache.c

refactor handling of "other" files in ls-files and... Jeff King Thu, 16 Oct 2008 15:07:26 +0000 (11:07 -0400)

refactor handling of "other" files in ls-files and status

When the "git status" display code was originally converted
to C, we copied the code from ls-files to discover whether a
pathname returned by read_directory was an "other", or
untracked, file.

Much later, 5698454e updated the code in ls-files to handle
some new cases caused by gitlinks. This left the code in
wt-status.c broken: it would display submodule directories
as untracked directories. Nobody noticed until now, however,
because unless status.showUntrackedFiles was set to "all",
submodule directories were not actually reported by
read_directory. So the bug was only triggered in the
presence of a submodule _and_ this config option.

This patch pulls the ls-files code into a new function,
cache_name_is_other, and uses it in both places. This should
leave the ls-files functionality the same and fix the bug
in status.

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

describe: Make --tags and --all match lightweight tags... Shawn O. Pearce Mon, 13 Oct 2008 14:39:46 +0000 (07:39 -0700)

describe: Make --tags and --all match lightweight tags more often

If the caller supplies --tags they want the lightweight, unannotated
tags to be searched for a match. If a lightweight tag is closer
in the history, it should be matched, even if an annotated tag is
reachable further back in the commit chain.

The same applies with --all when matching any other type of ref.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Acked-By: Uwe Kleine-König <ukleinek@strlen.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: shell negation portability fixJeff King Mon, 13 Oct 2008 09:35:59 +0000 (05:35 -0400)

tests: shell negation portability fix

Commit 969c8775 introduced a test which uses the non-portable construct:

command1 && ! command2 | command3

which must be

command1 && ! (command2 | command3)

to work on bsd shells (this is another example of bbf08124, which fixed
several similar cases).

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

pull: allow "git pull origin $something:$current_branch... Junio C Hamano Tue, 14 Oct 2008 22:32:20 +0000 (15:32 -0700)

pull: allow "git pull origin $something:$current_branch" into an unborn branch

Some misguided documents floating on the Net suggest this sequence:

mkdir newdir && cd newdir
git init
git remote add origin $url
git pull origin master:master

"git pull" has known about misguided "pull" that lets the underlying fetch
update the current branch for a long time. It also has known about
"git pull origin master" into a branch yet to be born.

These two workarounds however were not aware of the existence of each
other and did not work well together. This fixes it.

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

gitk: New way of constructing menus that allows for... Paul Mackerras Fri, 17 Oct 2008 11:44:42 +0000 (22:44 +1100)

gitk: New way of constructing menus that allows for Alt+letter accelerators

This is inspired by patches from Robin Rosenberg but takes a different
approach. This adds a "makemenu" procedure for constructing menus
that allows the menu layout to be specified in a clear fashion, and
provides one place where the alt+letter accelerators can be detected
and handled.

The alt+letter accelerator is specified by putting an ampersand (&)
before the letter for the accelerator in the menu item name. (Two
ampersands in succession produce one ampersand in the menu item as
it appears on screen.) This is handled in makemenu.

We also add an mca procedure which is like mc but also does the
ampersand translation, for use when we want to refer to a menu item
by name. The mca name and the locations where we use it were
shamelessly stolen from Robin Rosenberg's patch.

This doesn't actually add any alt+letter accelerators yet.

Signed-off-by: Paul Mackerras <paulus@samba.org>

Merge branch 'maint'Junio C Hamano Fri, 17 Oct 2008 08:52:32 +0000 (01:52 -0700)

Merge branch 'maint'

* maint:
t1301-shared-repo.sh: don't let a default ACL interfere with the test
git-check-attr(1): add output and example sections
xdiff-interface.c: strip newline (and cr) from line before pattern matching
t4018-diff-funcname: demonstrate end of line funcname matching flaw
t4018-diff-funcname: rework negated last expression test
Typo "does not exists" when git remote update remote.
remote.c: correct the check for a leading '/' in a remote name
Add testcase to ensure merging an early part of a branch is done properly

Conflicts:
t/t7600-merge.sh

t1301-shared-repo.sh: don't let a default ACL interfere... Matt McCutchen Fri, 17 Oct 2008 02:32:14 +0000 (22:32 -0400)

t1301-shared-repo.sh: don't let a default ACL interfere with the test

This test creates files with several different umasks and expects their
permissions to be initialized according to the umask, so a default ACL on the
trash directory (which overrides the umask for files created in that directory)
causes the test to fail. To avoid that, remove the default ACL if possible with
setfacl(1).

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase--interactive: fix parent rewriting for dropped... Stephen Haberman Mon, 6 Oct 2008 04:26:52 +0000 (23:26 -0500)

rebase--interactive: fix parent rewriting for dropped commits

`rebase -i -p` got its rev-list of commits to keep by --left-right and
--cherry-pick. Adding --cherry-pick would drop commits that duplicated changes
already in the rebase target.

The dropped commits were then forgotten about when it came to rewriting the
parents of their descendents, so the descendents would get cherry-picked with
their old, unwritten parents and essentially make the rebase a no-op.

This commit adds a $DOTEST/dropped directory to remember dropped commits and
rewrite their children's parent as the dropped commit's possibly-rewritten
first-parent.

Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-check-attr(1): use 'verse' for multi-line synopsis... Jonas Fonseca Wed, 15 Oct 2008 07:11:52 +0000 (09:11 +0200)

git-check-attr(1): use 'verse' for multi-line synopsis sections

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-check-attr(1): add output and example sectionsJonas Fonseca Wed, 15 Oct 2008 07:10:58 +0000 (09:10 +0200)

git-check-attr(1): add output and example sections

Plumbing tools should document what output can be expected.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

xdiff-interface.c: strip newline (and cr) from line... Brandon Casey Wed, 1 Oct 2008 19:28:26 +0000 (14:28 -0500)

xdiff-interface.c: strip newline (and cr) from line before pattern matching

POSIX doth sayeth:

"In the regular expression processing described in IEEE Std 1003.1-2001,
the <newline> is regarded as an ordinary character and both a period and
a non-matching list can match one. ... Those utilities (like grep) that
do not allow <newline>s to match are responsible for eliminating any
<newline> from strings before matching against the RE."

Thus far git has not been removing the trailing newline from strings matched
against regular expression patterns. This has the effect that (quoting
Jonathan del Strother) "... a line containing just 'FUNCNAME' (terminated by
a newline) will be matched by the pattern '^(FUNCNAME.$)' but not
'^(FUNCNAME$)'", and more simply not '^FUNCNAME$'.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

t4018-diff-funcname: demonstrate end of line funcname... Brandon Casey Thu, 16 Oct 2008 00:58:50 +0000 (19:58 -0500)

t4018-diff-funcname: demonstrate end of line funcname matching flaw

Since the newline is not removed from lines before pattern matching, a
pattern cannot match to the end of the line using the '$' operator without
using an additional operator which will indirectly match the '\n' character.

Introduce a test which should pass, but which does not due to this flaw.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4018-diff-funcname: rework negated last expression... Brandon Casey Thu, 16 Oct 2008 00:58:49 +0000 (19:58 -0500)

t4018-diff-funcname: rework negated last expression test

This test used the non-zero exit status of 'git diff' to indicate that a
negated funcname pattern, when placed last, was correctly rejected.

The problem with this is that 'git diff' always returns non-zero if it
finds differences in the files it is comparing, and the files must
contain differences in order to trigger the funcname pattern codepath.

Instead of checking for non-zero exit status, make sure the expected
error message is printed.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Typo "does not exists" when git remote update remote.Mikael Magnusson Fri, 19 Sep 2008 13:48:08 +0000 (15:48 +0200)

Typo "does not exists" when git remote update remote.

gitk: Bind Key-Return to create on new branch dialogRichard Quirk Tue, 14 Oct 2008 20:53:25 +0000 (22:53 +0200)

gitk: Bind Key-Return to create on new branch dialog

The Return key can now be used as well as pressing the Create button
from the dialog box that is shown when selecting "Create new branch".

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Fix binding for <Return> in sha1 entry fieldPaul Mackerras Wed, 15 Oct 2008 22:57:02 +0000 (09:57 +1100)

gitk: Fix binding for <Return> in sha1 entry field

This adds a break so that gitk doesn't go and execute the global
binding for <Return> (i.e. find next) when the user presses the
return key in the sha1 entry field to indicate that gitk should
jump to the commit identified by what they just put into the
sha1 field.

Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Clean up file encoding code and add enable/disabl... Paul Mackerras Wed, 15 Oct 2008 11:23:03 +0000 (22:23 +1100)

gitk: Clean up file encoding code and add enable/disable option

This adds an option allowing the user to select whether gitk should
look up per-file encoding settings using git check-attr or not. If
not, gitk uses the global encoding set in the git config (as reported
by git config --get gui.encoding) for all files, or if that is not
set, then the system encoding.

The option is controlled by a checkbox in the Edit->Preferences
window, and defaults to off for now because git check-attr is so
slow. When the user turns it on we discard any cached diff file
lists in treediffs, because we may not have encodings cached for
the files listed in those lists, meaning that getblobdiffline will
do it for each file, which will be really really slow.

This adjusts the limit of how many paths cache_gitattr passes to each
instance of git check-attr depending on whether we're running under
windows or not. Passing only 30 doesn't effectively amortize the
startup costs of git check-attr, but it's all we can do under windows
because of the 32k limit on arguments to a command. Under other OSes
we pass up to 1000.

Similarly we adjust how many lines gettreediffline processes depending
on whether we are doing per-file encodings so that we don't run for
too long. When we are, 500 seems to be a reasonable limit, leading
to gettreediffline taking about 60-70ms under Linux (almost all of
which is in cache_gitattr, unfortunately). This means that we can
take out the update call in cache_gitattr.

This adds a simple cache on [tclencoding]. Now that we get repeated
calls to translate the same encoding, this is useful.

This reindents the new code added in the last couple of commits to
conform to the gitk 4-space indent and makes various other improvements:
use regexp in gitattr and cache_gitattr instead of split + join + regsub,
make gui_encoding be the value from [tclencoding] to avoid having to
do [tcl_encoding $gui_encoding] in each call to get_path_encoding,
and print a warning message at startup if $gui_encoding isn't
supported by Tcl.

Signed-off-by: Paul Mackerras <paulus@samba.org>

remote.c: correct the check for a leading '/' in a... Brandon Casey Tue, 14 Oct 2008 20:30:21 +0000 (15:30 -0500)

remote.c: correct the check for a leading '/' in a remote name

This test is supposed to disallow remote entries in the config file of the
form:

[remote "/foobar"]
...

The leading slash in '/foobar' is not acceptable.

Instead it was incorrectly testing that the subkey had no leading '/', which
had no effect since the subkey pointer was made to point at a '.' in the
preceding lines.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add testcase to ensure merging an early part of a branc... Miklos Vajna Mon, 13 Oct 2008 20:54:25 +0000 (22:54 +0200)

Add testcase to ensure merging an early part of a branch is done properly

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase: Document --no-verify option to bypass pre-rebas... Nanako Shiraishi Mon, 13 Oct 2008 23:17:16 +0000 (08:17 +0900)

rebase: Document --no-verify option to bypass pre-rebase hook

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add Linux PPC support to the pre-auto-gc example hookMiklos Vajna Tue, 14 Oct 2008 14:42:45 +0000 (16:42 +0200)

Add Linux PPC support to the pre-auto-gc example hook

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4018-diff-funcname: add objective-c xfuncname pattern... Brandon Casey Tue, 14 Oct 2008 20:22:10 +0000 (15:22 -0500)

t4018-diff-funcname: add objective-c xfuncname pattern to syntax test

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

gitk: Implement batch lookup and caching of encoding... Alexander Gavrilov Mon, 13 Oct 2008 08:12:33 +0000 (12:12 +0400)

gitk: Implement batch lookup and caching of encoding attrs

When the diff contains thousands of files, calling git-check-attr once
per file is very slow. With this patch gitk does attribute lookup in
batches of 30 files while reading the diff file list, which leads to a
very noticeable speedup.

It may be possible to reimplement this even more efficiently, if
git-check-attr is modified to support a --stdin-paths option.
Additionally, it should quote the ':' character in file paths, or
provide a more robust way of column separation.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Paul Mackerras <paulus@samba.org>

gitk: Enhance file encoding supportAlexander Gavrilov Mon, 13 Oct 2008 08:12:31 +0000 (12:12 +0400)

gitk: Enhance file encoding support

This allows the encoding to be specified for file contents and used
when displaying files and diffs in the bottom-left pane. When
displaying diffs, the encoding for each diff hunk is that for the file
that the diff hunk is from, so it can change through the course of the
diff.

The encoding for file contents is determined as follows:

- File encoding defaults to the system encoding.
- It can be overridden by setting the gui.encoding option.
- Finally, the 'encoding' attribute is checked on
per-file basis; it has the last word.

Note: Since git-check-attr does not provide support for reading
attributes from trees, attribute lookup is done using files from the
working directory.

This also extends the range of supported encoding names, adding
ShiftJIS and Shift-JIS as aliases for Shift_JIS, and allowing
cp-*, cp_*, ibm-*, ibm_*, jis-* and jis_* as aliases for cp*,
ibm* and jis* respectively.

This also fixes some bugs in handling of non-ASCII filenames. Core
git apparently supports only locale-encoded filenames, so processing
is done using the system encoding.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Update draft release notes to 1.6.1Junio C Hamano Tue, 14 Oct 2008 00:05:45 +0000 (17:05 -0700)

Update draft release notes to 1.6.1

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

Merge branch 'maint'Junio C Hamano Mon, 13 Oct 2008 22:41:49 +0000 (15:41 -0700)

Merge branch 'maint'

* maint:
Update draft release notes to 1.6.0.3

Update draft release notes to 1.6.0.3Junio C Hamano Mon, 13 Oct 2008 22:41:36 +0000 (15:41 -0700)

Update draft release notes to 1.6.0.3

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

compat/cygwin.c - Use cygwin's stat if core.filemode... Mark Levedahl Mon, 13 Oct 2008 04:33:31 +0000 (00:33 -0400)

compat/cygwin.c - Use cygwin's stat if core.filemode == true

Cygwin's POSIX emulation allows use of core.filemode true, unlike native
Window's implementation of stat / lstat, and Cygwin/git users who have
configured core.filemode true in various repositories will be very
unpleasantly surprised to find that git is no longer honoring that option.
So, this patch forces use of Cygwin's stat functions if core.filemode is
set true, regardless of any other considerations.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix fetch/pull when run without --update-head-okJohannes Schindelin Mon, 13 Oct 2008 09:36:52 +0000 (11:36 +0200)

Fix fetch/pull when run without --update-head-ok

Some confusing tutorials suggested that it would be a good idea to fetch
into the current branch with something like this:

git fetch origin master:master

(or even worse: the same command line with "pull" instead of "fetch").
While it might make sense to store what you want to pull, it typically is
plain wrong when the current branch is "master". This should only be
allowed when (an incorrect) "git pull origin master:master" tries to work
around by giving --update-head-ok to underlying "git fetch", and otherwise
we should refuse it, but somewhere along the lines we lost that behavior.

The check for the current branch is now _only_ performed in non-bare
repositories, which is an improvement from the original behaviour.

Some newer tests were depending on the broken behaviour of "git fetch"
this patch fixes, and have been adjusted.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: shell negation portability fixJeff King Mon, 13 Oct 2008 09:35:59 +0000 (05:35 -0400)

tests: shell negation portability fix

Commit 969c8775 introduced a test which uses the non-portable construct:

command1 && ! command2 | command3

which must be

command1 && ! (command2 | command3)

to work on bsd shells (this is another example of bbf08124, which fixed
several similar cases).

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