gitweb.git
Merge branch 'jc/branch-d'Junio C Hamano Sat, 23 Jan 2010 00:08:19 +0000 (16:08 -0800)

Merge branch 'jc/branch-d'

* jc/branch-d:
branch -d: base the "already-merged" safety on the branch it merges with

Merge branch 'il/rev-glob'Junio C Hamano Sat, 23 Jan 2010 00:08:16 +0000 (16:08 -0800)

Merge branch 'il/rev-glob'

* il/rev-glob:
Documentation: improve description of --glob=pattern and friends
rev-parse --branches/--tags/--remotes=pattern
rev-parse --glob

Merge branch 'js/refer-upstream'Junio C Hamano Sat, 23 Jan 2010 00:08:13 +0000 (16:08 -0800)

Merge branch 'js/refer-upstream'

* js/refer-upstream:
Teach @{upstream} syntax to strbuf_branchanme()
t1506: more test for @{upstream} syntax
Introduce <branch>@{upstream} notation

Merge branch 'jl/submodule-diff'Junio C Hamano Sat, 23 Jan 2010 00:08:10 +0000 (16:08 -0800)

Merge branch 'jl/submodule-diff'

* jl/submodule-diff:
Performance optimization for detection of modified submodules
git status: Show uncommitted submodule changes too when enabled
Teach diff that modified submodule directory is dirty
Show submodules as modified when they contain a dirty work tree

Merge branch 'il/remote-updates'Junio C Hamano Sat, 23 Jan 2010 00:08:07 +0000 (16:08 -0800)

Merge branch 'il/remote-updates'

* il/remote-updates:
Add git remote set-url

Merge branch 'il/branch-set-upstream'Junio C Hamano Sat, 23 Jan 2010 00:08:05 +0000 (16:08 -0800)

Merge branch 'il/branch-set-upstream'

* il/branch-set-upstream:
branch: warn and refuse to set a branch as a tracking branch of itself.
Add branch --set-upstream

Merge branch 'jc/maint-limit-note-output'Junio C Hamano Sat, 23 Jan 2010 00:08:01 +0000 (16:08 -0800)

Merge branch 'jc/maint-limit-note-output'

* jc/maint-limit-note-output:
Fix "log --oneline" not to show notes
Fix "log" family not to be too agressive about showing notes

Merge branch 'nd/ls-files-sparse-fix'Junio C Hamano Sat, 23 Jan 2010 00:07:18 +0000 (16:07 -0800)

Merge branch 'nd/ls-files-sparse-fix'

* nd/ls-files-sparse-fix:
Fix memory corruption when .gitignore does not end by \n

Make difftool.prompt fall back to mergetool.promptSebastian Schuberth Fri, 22 Jan 2010 16:36:36 +0000 (17:36 +0100)

Make difftool.prompt fall back to mergetool.prompt

The documentation states that "git-difftool falls back to git-mergetool
config variables when the difftool equivalents have not been defined".
Until now, this was not the case for "difftool.prompt".

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

engine.pl: Fix a recent breakage of the buildsystem... Ramsay Jones Fri, 22 Jan 2010 20:00:47 +0000 (20:00 +0000)

engine.pl: Fix a recent breakage of the buildsystem generator

Commit ade2ca0c (Do not try to remove directories when removing
old links, 2009-10-27) added an expression to a 'test' using an
'-o' or connective. This resulted in the buildsystem generator
mistaking a conditional 'rm' for a linker command. In order to
fix the breakage, we filter out all 'test' commands before then
attempting to identify the commands of interest.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-mv: fix moving more than one source to a single... Junio C Hamano Fri, 22 Jan 2010 22:17:06 +0000 (14:17 -0800)

git-mv: fix moving more than one source to a single destination

The code used as if return value from basename(3) were stable, but
often the function is implemented to return a pointer to a static
storage internal to it.

Because basename(3) is also allowed to modify its input parameter in
place, casting constness away from the strings we obtained from the
caller and giving them to basename is a no-no.

Reported, and initial fix and test supplied by David Rydh.

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

rebase -i: Enclose sed command substitution in quotesMichael Haggerty Fri, 22 Jan 2010 09:22:30 +0000 (10:22 +0100)

rebase -i: Enclose sed command substitution in quotes

Reported by: Johannes Sixt <j.sixt@viscovery.net>

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty Fri, 22 Jan 2010 09:22:29 +0000 (10:22 +0100)

rebase -i: Avoid non-portable "test X -a Y"

Reported by: Eric Blake <ebb9@byu.net>

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "index-pack" a built-inLinus Torvalds Fri, 22 Jan 2010 15:55:19 +0000 (07:55 -0800)

make "index-pack" a built-in

This required some fairly trivial packfile function 'const' cleanup,
since the builtin commands get a const char *argv[] array.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "git pack-redundant" a built-inLinus Torvalds Fri, 22 Jan 2010 15:42:14 +0000 (07:42 -0800)

make "git pack-redundant" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "git unpack-file" a built-inLinus Torvalds Fri, 22 Jan 2010 15:38:03 +0000 (07:38 -0800)

make "git unpack-file" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "mktag" a built-inLinus Torvalds Fri, 22 Jan 2010 15:34:44 +0000 (07:34 -0800)

make "mktag" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "merge-index" a built-inLinus Torvalds Fri, 22 Jan 2010 15:29:21 +0000 (07:29 -0800)

make "merge-index" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-tree: remove unnecessary call of git_extract_argv... Johannes Sixt Fri, 22 Jan 2010 11:47:59 +0000 (12:47 +0100)

merge-tree: remove unnecessary call of git_extract_argv0_path

This call should have been removed when the utility was made a builtin by
907a7cb.

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

make "git patch-id" a built-inLinus Torvalds Fri, 22 Jan 2010 04:31:25 +0000 (20:31 -0800)

make "git patch-id" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "git var" a built-inLinus Torvalds Fri, 22 Jan 2010 04:21:55 +0000 (20:21 -0800)

make "git var" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fix git-p4 editor invocationNicolas Pitre Fri, 22 Jan 2010 05:55:15 +0000 (00:55 -0500)

fix git-p4 editor invocation

The strip() is required to remove the trailing newline character,
as already done elsewhere.

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

Documentation: improve description of --glob=pattern... Thomas Rast Fri, 22 Jan 2010 00:21:38 +0000 (01:21 +0100)

Documentation: improve description of --glob=pattern and friends

Consolidate the descriptions of --branches, --tags and --remotes a
bit, to make it less repetitive. Improve the grammar a bit, and spell
out the meaning of the 'append /*' rule.

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

Merge branch 'maint'Junio C Hamano Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800)

Merge branch 'maint'

* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails

make "git hash-object" a built-inLinus Torvalds Fri, 22 Jan 2010 03:50:11 +0000 (19:50 -0800)

make "git hash-object" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make "git merge-tree" a built-inLinus Torvalds Fri, 22 Jan 2010 02:25:20 +0000 (18:25 -0800)

make "git merge-tree" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

slim down "git show-index"Linus Torvalds Thu, 21 Jan 2010 23:25:19 +0000 (15:25 -0800)

slim down "git show-index"

As the documentation says, this is primarily for debugging, and
in the longer term we should rename it to test-show-index or something.

In the meantime, just avoid xmalloc (which slurps in the rest of git), and
separating out the trivial hex functions into "hex.o".

This results in

[torvalds@nehalem git]$ size git-show-index
text data bss dec hex filename
222818 2276 112688 337782 52776 git-show-index (before)
5696 624 1264 7584 1da0 git-show-index (after)

which is a whole lot better.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Remove diff machinery dependency from read-cacheLinus Torvalds Thu, 21 Jan 2010 19:37:38 +0000 (11:37 -0800)

Remove diff machinery dependency from read-cache

Exal Sibeaz pointed out that some git files are way too big, and that
add_files_to_cache() brings in all the diff machinery to any git binary
that needs the basic git SHA1 object operations from read-cache.c. Which
is pretty much all of them.

It's doubly silly, since add_files_to_cache() is only used by builtin
programs (add, checkout and commit), so it's fairly easily fixed by just
moving the thing to builtin-add.c, and avoiding the dependency entirely.

I initially argued to Exal that it would probably be best to try to depend
on smart compilers and linkers, but after spending some time trying to
make -ffunction-sections work and giving up, I think Exal was right, and
the fix is to just do some trivial cleanups like this.

This trivial cleanup results in pretty stunning file size differences.
The diff machinery really is mostly used by just the builtin programs, and
you have things like these trivial before-and-after numbers:

-rwxr-xr-x 1 torvalds torvalds 1727420 2010-01-21 10:53 git-hash-object
-rwxrwxr-x 1 torvalds torvalds 940265 2010-01-21 11:16 git-hash-object

Now, I'm not saying that 940kB is good either, but that's mostly all the
debug information - you can see the real code with 'size':

text data bss dec hex filename
418675 3920 127408 550003 86473 git-hash-object (before)
230650 2288 111728 344666 5425a git-hash-object (after)

ie we have a nice 24% size reduction from this trivial cleanup.

It's not just that one file either. I get:

[torvalds@nehalem git]$ du -s /home/torvalds/libexec/git-core
45640 /home/torvalds/libexec/git-core (before)
33508 /home/torvalds/libexec/git-core (after)

so we're talking 12MB of diskspace here.

(Of course, stripping all the binaries brings the 33MB down to 9MB, so the
whole debug information thing is still the bulk of it all, but that's a
separate issue entirely)

Now, I'm sure there are other things we should do, and changing our
compiler flags from -O2 to -Os would bring the text size down by an
additional almost 20%, but this thing Exal pointed out seems to be some
good low-hanging fruit.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

merge-recursive: do not return NULL only to cause segfaultJunio C Hamano Fri, 22 Jan 2010 00:38:56 +0000 (16:38 -0800)

merge-recursive: do not return NULL only to cause segfault

merge-recursive calls write_tree_from_memory() to come up with a virtual
tree, with possible conflict markers inside the blob contents, while
merging multiple common ancestors down. It is a bug to call the function
with unmerged entries in the index, even if the merge to come up with the
common ancestor resulted in conflicts. Otherwise the result won't be
expressible as a tree object.

We _might_ want to suggest the user to set GIT_MERGE_VERBOSITY to 5 and
re-run the merge in the message. At least we will know which part of
process_renames() or process_entry() functions is not correctly handling
the unmerged paths, and it might help us diagnosing the issue.

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

git-rebase.txt: Fix spellingHorst H. von Brand Thu, 21 Jan 2010 20:34:25 +0000 (17:34 -0300)

git-rebase.txt: Fix spelling

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

retry request without query when info/refs?query failsTay Ray Chuan Thu, 21 Jan 2010 14:41:00 +0000 (22:41 +0800)

retry request without query when info/refs?query fails

When "info/refs" is a static file and not behind a CGI handler, some
servers may not handle a GET request for it with a query string
appended (eg. "?foo=bar") properly.

If such a request fails, retry it sans the query string. In addition,
ensure that the "smart" http protocol is not used (a service has to be
specified with "?service=<service name>" to be conformant).

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Reported-and-tested-by: Yaroslav Halchenko <debian@onerussian.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix "log --oneline" not to show notesJunio C Hamano Thu, 21 Jan 2010 22:57:41 +0000 (14:57 -0800)

Fix "log --oneline" not to show notes

This option should be treated pretty much the same as --format="%h %s".

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

Make 'rerere forget' work from a subdirectory.Johannes Sixt Thu, 21 Jan 2010 08:23:48 +0000 (09:23 +0100)

Make 'rerere forget' work from a subdirectory.

It forgot to apply the prefix to the paths given on the command line.

[jc: added test]

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

Make test case numbers uniqueJohannes Sixt Thu, 21 Jan 2010 07:57:03 +0000 (08:57 +0100)

Make test case numbers unique

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

conflict-marker-size: add test and docsJunio C Hamano Thu, 21 Jan 2010 07:49:27 +0000 (23:49 -0800)

conflict-marker-size: add test and docs

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

Update draft release notes to 1.7.0Junio C Hamano Thu, 21 Jan 2010 07:30:45 +0000 (23:30 -0800)

Update draft release notes to 1.7.0

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

Merge branch 'bw/cvsimport'Junio C Hamano Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)

Merge branch 'bw/cvsimport'

* bw/cvsimport:
cvsimport: standarize system() calls to external git tools
cvsimport: standarize open() calls to external git tools
cvsimport: modernize callouts to git subcommands

Merge branch 'jc/checkout-merge-base'Junio C Hamano Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)

Merge branch 'jc/checkout-merge-base'

* jc/checkout-merge-base:
Fix "checkout A..." synonym for "checkout A...HEAD" on Windows

Merge branch 'ag/patch-header-verify'Junio C Hamano Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)

Merge branch 'ag/patch-header-verify'

* ag/patch-header-verify:
builtin-apply.c: fix the --- and +++ header filename consistency check

Merge branch 'jc/conflict-marker-size'Junio C Hamano Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)

Merge branch 'jc/conflict-marker-size'

* jc/conflict-marker-size:
rerere: honor conflict-marker-size attribute
rerere: prepare for customizable conflict marker length
conflict-marker-size: new attribute
rerere: use ll_merge() instead of using xdl_merge()
merge-tree: use ll_merge() not xdl_merge()
xdl_merge(): allow passing down marker_size in xmparam_t
xdl_merge(): introduce xmparam_t for merge specific parameters
git_attr(): fix function signature

Conflicts:
builtin-merge-file.c
ll-merge.c
xdiff/xdiff.h
xdiff/xmerge.c

Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano Thu, 21 Jan 2010 04:28:50 +0000 (20:28 -0800)

Merge branch 'ag/maint-apply-too-large-p'

* ag/maint-apply-too-large-p:
builtin-apply.c: Skip filenames without enough components

Merge branch 'ap/merge-backend-opts'Junio C Hamano Thu, 21 Jan 2010 04:28:50 +0000 (20:28 -0800)

Merge branch 'ap/merge-backend-opts'

* ap/merge-backend-opts:
Document that merge strategies can now take their own options
Extend merge-subtree tests to test -Xsubtree=dir.
Make "subtree" part more orthogonal to the rest of merge-recursive.
pull: Fix parsing of -X<option>
Teach git-pull to pass -X<option> to git-merge
git merge -X<option>
git-merge-file --ours, --theirs

Conflicts:
git-compat-util.h

Merge branch 'nd/status-partial-refresh'Junio C Hamano Thu, 21 Jan 2010 04:28:50 +0000 (20:28 -0800)

Merge branch 'nd/status-partial-refresh'

* nd/status-partial-refresh:
rm: only refresh entries that we may touch
status: only touch path we may need to check

Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano Thu, 21 Jan 2010 04:28:49 +0000 (20:28 -0800)

Merge remote branch 'remotes/trast-doc/for-next'

* remotes/trast-doc/for-next:
Documentation: spell 'git cmd' without dash throughout
Documentation: format full commands in typewriter font
Documentation: warn prominently against merging with dirty trees
Documentation/git-merge: reword references to "remote" and "pull"

Conflicts:
Documentation/config.txt
Documentation/git-config.txt
Documentation/git-merge.txt

Merge branch 'jh/notes' (early part)Junio C Hamano Thu, 21 Jan 2010 04:28:49 +0000 (20:28 -0800)

Merge branch 'jh/notes' (early part)

* 'jh/notes' (early part):
Add more testcases to test fast-import of notes
Rename t9301 to t9350, to make room for more fast-import tests
fast-import: Proper notes tree manipulation

Merge branch 'maint'Junio C Hamano Thu, 21 Jan 2010 04:28:39 +0000 (20:28 -0800)

Merge branch 'maint'

* maint:
status: don't require the repository to be writable

Conflicts:
builtin-commit.c

Merge branch 'jc/maint-refresh-index-is-optional-for... Junio C Hamano Thu, 21 Jan 2010 04:25:11 +0000 (20:25 -0800)

Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maint

* jc/maint-refresh-index-is-optional-for-status:
status: don't require the repository to be writable

Fix memory corruption when .gitignore does not end... Nguyễn Thái Ngọc Duy Wed, 20 Jan 2010 14:09:16 +0000 (21:09 +0700)

Fix memory corruption when .gitignore does not end by \n

Commit b5041c5 (Avoid writing to buffer in add_excludes_from_file_1())
tried not to append '\n' at the end because the next commit
may return a buffer that does not have extra space for that.

Unfortunately it left this assignment in the loop:

buf[i - (i && buf[i-1] == '\r')] = 0;

that can corrupt memory if "buf" is not '\n' terminated. But even if
it does not corrupt memory, the last line would not be
NULL-terminated, leading to errors later inside add_exclude().

This patch fixes it by reverting the faulty commit and make
sure "buf" is always \n terminated.

While at it, free unused memory properly.

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

Fix "log" family not to be too agressive about showing... Junio C Hamano Wed, 20 Jan 2010 21:59:36 +0000 (13:59 -0800)

Fix "log" family not to be too agressive about showing notes

Giving "Notes" information in the default output format of "log" and
"show" is a sensible progress (the user has asked for it by having the
notes), but for some commands (e.g. "format-patch") spewing notes into the
formatted commit log message without being asked is too aggressive.

Enable notes output only for "log", "show", "whatchanged" by default and
only when the user didn't ask any specific --pretty/--format from the
command line; users can explicitly override this default with --show-notes
and --no-notes option.

Parts of tests are taken from Jeff King's fix.

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

Merge branch 'rr/core-tutorial'Junio C Hamano Wed, 20 Jan 2010 23:24:42 +0000 (15:24 -0800)

Merge branch 'rr/core-tutorial'

* rr/core-tutorial:
Documentation: Update git core tutorial clarifying reference to scripts

Merge branch 'jc/cache-unmerge'Junio C Hamano Wed, 20 Jan 2010 22:44:31 +0000 (14:44 -0800)

Merge branch 'jc/cache-unmerge'

* jc/cache-unmerge:
rerere forget path: forget recorded resolution
rerere: refactor rerere logic to make it independent from I/O
rerere: remove silly 1024-byte line limit
resolve-undo: teach "update-index --unresolve" to use resolve-undo info
resolve-undo: "checkout -m path" uses resolve-undo information
resolve-undo: allow plumbing to clear the information
resolve-undo: basic tests
resolve-undo: record resolved conflicts in a new index extension section
builtin-merge.c: use standard active_cache macros

Conflicts:
builtin-ls-files.c
builtin-merge.c
builtin-rerere.c

Merge branch 'js/exec-error-report'Junio C Hamano Wed, 20 Jan 2010 22:44:12 +0000 (14:44 -0800)

Merge branch 'js/exec-error-report'

* js/exec-error-report:
Improve error message when a transport helper was not found
start_command: detect execvp failures early
run-command: move wait_or_whine earlier
start_command: report child process setup errors to the parent's stderr

Conflicts:
Makefile

Merge branch 'jc/ls-files-ignored-pathspec'Junio C Hamano Wed, 20 Jan 2010 22:43:54 +0000 (14:43 -0800)

Merge branch 'jc/ls-files-ignored-pathspec'

* jc/ls-files-ignored-pathspec:
ls-files: fix overeager pathspec optimization
read_directory(): further split treat_path()
read_directory_recursive(): refactor handling of a single path into a separate function
t3001: test ls-files -o ignored/dir

Merge branch 'jc/grep-lookahead'Junio C Hamano Wed, 20 Jan 2010 22:43:41 +0000 (14:43 -0800)

Merge branch 'jc/grep-lookahead'

* jc/grep-lookahead:
grep --no-index: allow use of "git grep" outside a git repository
grep: prepare to run outside of a work tree
grep: rip out pessimization to use fixmatch()
grep: rip out support for external grep
grep: optimize built-in grep by skipping lines that do not hit

Conflicts:
builtin-grep.c
t/t7002-grep.sh

Merge branch 'jc/maint-strbuf-add-fix-doubling'Junio C Hamano Wed, 20 Jan 2010 22:43:09 +0000 (14:43 -0800)

Merge branch 'jc/maint-strbuf-add-fix-doubling'

* jc/maint-strbuf-add-fix-doubling:
strbuf_addbuf(): allow passing the same buf to dst and src

Merge branch 'mm/conflict-advice'Junio C Hamano Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800)

Merge branch 'mm/conflict-advice'

* mm/conflict-advice:
Be more user-friendly when refusing to do something because of conflict.

Conflicts:
Documentation/config.txt
advice.c
advice.h

Merge branch 'da/difftool'Junio C Hamano Wed, 20 Jan 2010 22:42:20 +0000 (14:42 -0800)

Merge branch 'da/difftool'

* da/difftool:
difftool: Update copyright notices to list each year separately
difftool: Use eval to expand '--extcmd' expressions
difftool: Add '-x' and as an alias for '--extcmd'
t7800-difftool.sh: Simplify the --extcmd test
git-diff.txt: Link to git-difftool
difftool: Allow specifying unconfigured commands with --extcmd
difftool--helper: Remove use of the GIT_MERGE_TOOL variable
difftool--helper: Update copyright and remove distracting comments
git-difftool: Add '--gui' for selecting a GUI tool
t7800-difftool: Set a bogus tool for use by tests

Merge branch 'mh/rebase-fixup'Junio C Hamano Wed, 20 Jan 2010 22:42:07 +0000 (14:42 -0800)

Merge branch 'mh/rebase-fixup'

* mh/rebase-fixup:
rebase -i: Retain user-edited commit messages after squash/fixup conflicts
t3404: Set up more of the test repo in the "setup" step
rebase -i: For fixup commands without squashes, do not start editor
rebase -i: Change function make_squash_message into update_squash_message
rebase -i: Extract function do_with_author
rebase -i: Handle the author script all in one place in do_next
rebase -i: Extract a function "commit_message"
rebase -i: Simplify commit counting for generated commit messages
rebase -i: Improve consistency of commit count in generated commit messages
t3404: Test the commit count in commit messages generated by "rebase -i"
rebase -i: Introduce a constant AMEND
rebase -i: Introduce a constant AUTHOR_SCRIPT
rebase -i: Document how temporary files are used
rebase -i: Use symbolic constant $MSG consistently
rebase -i: Use "test -n" instead of "test ! -z"
rebase -i: Inline expression
rebase -i: Remove dead code
rebase -i: Make the condition for an "if" more transparent

Merge branch 'ns/rebase-auto-squash'Junio C Hamano Wed, 20 Jan 2010 22:42:04 +0000 (14:42 -0800)

Merge branch 'ns/rebase-auto-squash'

* ns/rebase-auto-squash:
rebase -i --autosquash: auto-squash commits

Conflicts:
git-rebase--interactive.sh

Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano Wed, 20 Jan 2010 22:41:48 +0000 (14:41 -0800)

Merge branch 'mh/rebase-fixup' (early part)

* 'mh/rebase-fixup' (early part):
rebase-i: Ignore comments and blank lines in peek_next_command
lib-rebase: Allow comments and blank lines to be added to the rebase script
lib-rebase: Provide clearer debugging info about what the editor did
Add a command "fixup" to rebase --interactive
t3404: Use test_commit to set up test repository

Merge branch 'il/push-set-upstream'Junio C Hamano Wed, 20 Jan 2010 22:40:48 +0000 (14:40 -0800)

Merge branch 'il/push-set-upstream'

* il/push-set-upstream:
Add push --set-upstream

Conflicts:
transport.c

Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano Wed, 20 Jan 2010 22:40:12 +0000 (14:40 -0800)

Merge branch 'jk/warn-author-committer-after-commit'

* jk/warn-author-committer-after-commit:
user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
commit.c::print_summary: do not release the format string too early
commit: allow suppression of implicit identity advice
commit: show interesting ident information in summary
strbuf: add strbuf_addbuf_percentquote
strbuf_expand: convert "%%" to "%"

Conflicts:
builtin-commit.c
ident.c

Merge branch 'jc/ident'Junio C Hamano Wed, 20 Jan 2010 22:39:52 +0000 (14:39 -0800)

Merge branch 'jc/ident'

* jc/ident:
ident.c: replace fprintf with fputs to suppress compiler warning
user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
ident.c: treat $EMAIL as giving user.email identity explicitly
ident.c: check explicit identity for name and email separately
ident.c: remove unused variables

Merge branch 'tr/http-push-ref-status'Junio C Hamano Wed, 20 Jan 2010 22:39:48 +0000 (14:39 -0800)

Merge branch 'tr/http-push-ref-status'

* tr/http-push-ref-status:
transport-helper.c::push_refs(): emit "no refs" error message
transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
transport.c::transport_push(): make ref status affect return value
refactor ref status logic for pushing
t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
t5541-http-push.sh: add tests for non-fast-forward pushes

Conflicts:
transport-helper.c

Merge branch 'bk/fix-relative-gitdir-file'Junio C Hamano Wed, 20 Jan 2010 22:38:34 +0000 (14:38 -0800)

Merge branch 'bk/fix-relative-gitdir-file'

* bk/fix-relative-gitdir-file:
Handle relative paths in submodule .git files
Test update-index for a gitlink to a .git file

Merge branch 'sd/cd-p-show-toplevel'Junio C Hamano Wed, 20 Jan 2010 22:38:30 +0000 (14:38 -0800)

Merge branch 'sd/cd-p-show-toplevel'

* sd/cd-p-show-toplevel:
Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
Add 'git rev-parse --show-toplevel' option.

Merge branch 'jc/symbol-static'Junio C Hamano Wed, 20 Jan 2010 22:37:25 +0000 (14:37 -0800)

Merge branch 'jc/symbol-static'

* jc/symbol-static:
date.c: mark file-local function static
Replace parse_blob() with an explanatory comment
symlinks.c: remove unused functions
object.c: remove unused functions
strbuf.c: remove unused function
sha1_file.c: remove unused function
mailmap.c: remove unused function
utf8.c: mark file-local function static
submodule.c: mark file-local function static
quote.c: mark file-local function static
remote-curl.c: mark file-local function static
read-cache.c: mark file-local functions static
parse-options.c: mark file-local function static
entry.c: mark file-local function static
http.c: mark file-local functions static
pretty.c: mark file-local function static
builtin-rev-list.c: mark file-local function static
bisect.c: mark file-local function static

date.c: mark file-local function staticJunio C Hamano Tue, 12 Jan 2010 07:52:47 +0000 (23:52 -0800)

date.c: mark file-local function static

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

Sync with 1.6.6.1Junio C Hamano Wed, 20 Jan 2010 22:01:28 +0000 (14:01 -0800)

Sync with 1.6.6.1

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

Git 1.6.6.1 v1.6.6.1Junio C Hamano Wed, 20 Jan 2010 21:29:21 +0000 (13:29 -0800)

Git 1.6.6.1

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

Merge branch 'bg/maint-remote-update-default' into... Junio C Hamano Wed, 20 Jan 2010 21:23:59 +0000 (13:23 -0800)

Merge branch 'bg/maint-remote-update-default' into maint

* bg/maint-remote-update-default:
Fix "git remote update" with remotes.defalt set

Merge branch 'sb/maint-octopus' into maintJunio C Hamano Wed, 20 Jan 2010 21:02:24 +0000 (13:02 -0800)

Merge branch 'sb/maint-octopus' into maint

* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow

Conflicts:
git-merge-octopus.sh

Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano Wed, 20 Jan 2010 21:01:33 +0000 (13:01 -0800)

Merge branch 'bg/maint-add-all-doc' into maint

* bg/maint-add-all-doc:
git-rm doc: Describe how to sync index & work tree
git-add/rm doc: Consistently back-quote
Documentation: 'git add -A' can remove files

Merge branch 'maint-1.6.5' into maintJunio C Hamano Wed, 20 Jan 2010 21:01:19 +0000 (13:01 -0800)

Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
Git 1.6.5.8
Fix mis-backport of t7002
bash completion: factor submodules into dirty state
reset: unbreak hard resets with GIT_WORK_TREE

Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes

Git 1.6.5.8 v1.6.5.8Junio C Hamano Wed, 20 Jan 2010 20:44:59 +0000 (12:44 -0800)

Git 1.6.5.8

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

rev-parse --branches/--tags/--remotes=patternIlari Liusvaara Wed, 20 Jan 2010 09:48:26 +0000 (11:48 +0200)

rev-parse --branches/--tags/--remotes=pattern

Since local branch, tags and remote tracking branch namespaces are
most often used, add shortcut notations for globbing those in
manner similar to --glob option.

With this, one can express the "what I have but origin doesn't?"
as:

'git log --branches --not --remotes=origin'

Original-idea-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rev-parse --globIlari Liusvaara Wed, 20 Jan 2010 09:48:25 +0000 (11:48 +0200)

rev-parse --glob

Add --glob=<glob-pattern> option to rev-parse and everything that
accepts its options. This option matches all refs that match given
shell glob pattern (complete with some DWIM logic).

Example:

'git log --branches --not --glob=remotes/origin'

To show what you have that origin doesn't.

Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/maint-1.6.5-reset-hard' into maint... Junio C Hamano Wed, 20 Jan 2010 20:22:58 +0000 (12:22 -0800)

Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5

* jk/maint-1.6.5-reset-hard:
reset: unbreak hard resets with GIT_WORK_TREE

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule... Junio C Hamano Wed, 20 Jan 2010 20:22:54 +0000 (12:22 -0800)

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5

* tr/maint-1.6.5-bash-prompt-show-submodule-changes:
bash completion: factor submodules into dirty state

Merge branch 'dp/maint-1.6.5-fast-import-non-commit... Junio C Hamano Wed, 20 Jan 2010 20:17:24 +0000 (12:17 -0800)

Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5

* dp/maint-1.6.5-fast-import-non-commit-tag:
fast-import: tag may point to any object type

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into... Junio C Hamano Wed, 20 Jan 2010 20:16:46 +0000 (12:16 -0800)

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5

* jm/maint-1.6.5-grep-NUL-terminate:
grep: NUL terminate input from a file

Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano Wed, 20 Jan 2010 07:17:11 +0000 (23:17 -0800)

Teach @{upstream} syntax to strbuf_branchanme()

This teaches @{upstream} syntax to interpret_branch_name(), instead
of dwim_ref() machinery.

There are places in git UI that behaves differently when you give a local
branch name and when you give an extended SHA-1 expression that evaluates
to the commit object name at the tip of the branch. The intent is that
the special syntax such as @{-1} can stand in as if the user spelled the
name of the branch in such places.

The name of the branch "frotz" to switch to ("git checkout frotz"), and
the name of the branch "nitfol" to fork a new branch "frotz" from ("git
checkout -b frotz nitfol"), are examples of such places. These places
take only the name of the branch (e.g. "frotz"), and they are supposed to
act differently to an equivalent refname (e.g. "refs/heads/frotz"), so
hooking the @{upstream} and @{-N} syntax to dwim_ref() is insufficient
when we want to deal with cases a local branch is forked from another
local branch and use "forked@{upstream}" to name the forkee branch.

The "upstream" syntax "forked@{u}" is to specify the ref that "forked" is
configured to merge with, and most often the forkee is a remote tracking
branch, not a local branch. We cannot simply return a local branch name,
but that does not necessarily mean we have to returns the full refname
(e.g. refs/remotes/origin/frotz, when returning origin/frotz is enough).
This update calls shorten_unambiguous_ref() to do so.

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

t1506: more test for @{upstream} syntaxJunio C Hamano Wed, 20 Jan 2010 09:08:48 +0000 (01:08 -0800)

t1506: more test for @{upstream} syntax

This adds a few more tests that exercises @{upstream} syntax by commands
that operate differently when they are given branch name as opposed to a
refname (i.e. where "master" and "refs/heads/master" makes a difference).

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

Fix "checkout A..." synonym for "checkout A...HEAD... Junio C Hamano Wed, 20 Jan 2010 03:30:06 +0000 (19:30 -0800)

Fix "checkout A..." synonym for "checkout A...HEAD" on Windows

When switching to a different commit, we first see the named rev exists
as a commit using lookup_commit_reference_gently(), and set new.path to
a string "refs/heads/" followed by the name the user gave us (but after
taking into special short-hands like @{-1} == "previous branch" and
"@{upstream}" == "the branch we merge with" into account). If the
resulting string names an existsing ref, then we are switching to that
branch (and will be building new commits on top of it); otherwise we are
detaching HEAD at that commit.

When the "master..." syntax is used as a short-hand for "master...HEAD",
we do want to detach HEAD at the merge base. However, on Windows, when
asked if ".git/refs/heads/master..." exists, the filesystem happily says
"it does" when ".git/refs/heads/master" exists.

Work this issue around by first calling check_ref_format(new.path) to see
if the string can possibly be a valid ref under "refs/heads/", before
asking resolve_ref().

We used to run another lookup_commit_reference(rev) even though we know it
succeeded and we have a good commit in new.commit already; this has been
with us from 782c2d6 (Build in checkout, 2008-02-07), the first version we
had "git checkout" implemented in C. Drop it.

Noticed by Alex Riesen.

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

status: don't require the repository to be writableJunio C Hamano Wed, 20 Jan 2010 01:10:35 +0000 (17:10 -0800)

status: don't require the repository to be writable

We need to update the index before hooks run when actually making a
commit, but we shouldn't have to write the index when running "status".
If we can, then we have already spent cycles to refresh the index and
it is a waste not to write it out, but it is not a disaster if we cannot
write it out. The main reason the user is running "git status" is to get
the "status", and refreshing the index is a mere side effect that we can
do without.

Discovery and initial attempted fix by Dscho.

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

Merge branch 'maint'Junio C Hamano Wed, 20 Jan 2010 00:57:10 +0000 (16:57 -0800)

Merge branch 'maint'

* maint:
bisect: fix singular/plural grammar nit

Makefile: honor NO_CURL when setting REMOTE_CURL_*... Johannes Sixt Tue, 19 Jan 2010 15:39:12 +0000 (16:39 +0100)

Makefile: honor NO_CURL when setting REMOTE_CURL_* variables

Previously, these variables were set before there was a chance to set
NO_CURL.

This made a difference only during 'make install', because by installing
$(REMOTE_CURL_ALIASES), the rule tries to access $(REMOTE_CURL_PRIMARY),
which was never installed. On Windows, this fails; on Unix, stale symbolic
links are created.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

ident.c: replace fprintf with fputs to suppress compile... Tarmigan Casebolt Sun, 17 Jan 2010 08:19:24 +0000 (00:19 -0800)

ident.c: replace fprintf with fputs to suppress compiler warning

Compiling today's pu gave
...
CC ident.o
CC levenshtein.o
ident.c: In function 'fmt_ident':
ident.c:206: warning: format not a string literal and no format arguments
CC list-objects.o
...

This warning seems to have appeared first in 18e95f279ec6 (ident.c:
remove unused variables) which removed additional fprintf arguments.

Suppress this warning by using fputs instead of fprintf.

Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rm: only refresh entries that we may touchNguyễn Thái Ngọc Duy Sun, 17 Jan 2010 08:43:13 +0000 (15:43 +0700)

rm: only refresh entries that we may touch

This gets rid of the whole tree cache refresh. Instead only path that
we touch will get refreshed. We may still lstat() more than needed,
but it'd be better playing safe.

This potentially reduces a large number of lstat() on big trees. Take
gentoo-x86 tree for example, which has roughly 80k files:

Unmodified Git:

$ time git rm --cached skel.ebuild
rm 'skel.ebuild'

real 0m1.441s
user 0m0.821s
sys 0m0.531s

Modified Git:

$ time ~/w/git/git rm --cached skel.ebuild
rm 'skel.ebuild'

real 0m0.941s
user 0m0.828s
sys 0m0.091s

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

bisect: fix singular/plural grammar nitDavid Ripton Tue, 19 Jan 2010 15:13:33 +0000 (07:13 -0800)

bisect: fix singular/plural grammar nit

Remove the trailing 's' from "revisions" and "steps" when there is
only one.

Signed-off-by: David Ripton <dripton@ripton.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cvsimport: standarize system() calls to external git... Ben Walton Tue, 19 Jan 2010 19:03:10 +0000 (14:03 -0500)

cvsimport: standarize system() calls to external git tools

This patch standardizes calls to system() where external git tools are
called. Instead of system("git foo ... "), use system(qw(git foo ...)).
All calls are made without the use of an 'sh -c' process to split the
arguments.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cvsimport: standarize open() calls to external git... Ben Walton Tue, 19 Jan 2010 19:03:09 +0000 (14:03 -0500)

cvsimport: standarize open() calls to external git tools

Standardize calls to open() where external git tools are used as
part of a pipeline. Instead of open(X, "git foo ... |)", use
open(X, "-|", qw(git foo ...)). All calls are made without the
use of an 'sh -c' process to split the arguments.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cvsimport: modernize callouts to git subcommandsBen Walton Tue, 19 Jan 2010 19:03:08 +0000 (14:03 -0500)

cvsimport: modernize callouts to git subcommands

This patch updates all calling conventions for external git tools. to
use the modern calling convention (eg: git foo instead of git-foo).
This is almost entierly a s/git-/git / operation, with deviations only
as required to keep tests passing.

Reported-by: Alexander Maier <amaier@opencsw.org>
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano Tue, 19 Jan 2010 05:37:12 +0000 (21:37 -0800)

Merge branch 'maint-1.6.4' into maint-1.6.5

* maint-1.6.4:
Fix mis-backport of t7002
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano Tue, 19 Jan 2010 05:37:06 +0000 (21:37 -0800)

Merge branch 'maint-1.6.3' into maint-1.6.4

* maint-1.6.3:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
builtin-commit.c

Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano Tue, 19 Jan 2010 05:29:47 +0000 (21:29 -0800)

Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails

Conflicts:
diff.c

Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano Tue, 19 Jan 2010 05:18:41 +0000 (21:18 -0800)

Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4

* commit 'v1.6.4.4-8-g8de6518':
Fix mis-backport of t7002

Fix mis-backport of t7002Junio C Hamano Tue, 19 Jan 2010 05:14:41 +0000 (21:14 -0800)

Fix mis-backport of t7002

The original patch that became cfe370c (grep: do not segfault when -f is
used, 2009-10-16), was made against "maint" or newer branch back then, but
the fix addressed the issue that was present as far as in 1.6.4 series.

The maintainer backported the patch to the 1.6.4 maintenance branch, but
failed to notice that the new tests assumed the setup done by the script
in "maint", which did quite a lot more than the same test script in 1.6.4
series, and the output didn't match the expected result.

This should fix it.

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

Update draft release notes to 1.7.0Junio C Hamano Tue, 19 Jan 2010 02:16:50 +0000 (18:16 -0800)

Update draft release notes to 1.7.0

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

Merge branch 'maint'Junio C Hamano Tue, 19 Jan 2010 02:16:19 +0000 (18:16 -0800)

Merge branch 'maint'

* maint:
Update draft release notes to 1.6.6.1
grep: NUL terminate input from a file
fast-import: tag may point to any object type