gitweb.git
builtin-help: fallback to GIT_MAN_VIEWER before manRomain Francoise Fri, 29 Aug 2008 15:00:43 +0000 (17:00 +0200)

builtin-help: fallback to GIT_MAN_VIEWER before man

In some situations it is useful to be able to switch viewers via the
environment, e.g. in Emacs shell buffers. So check the GIT_MAN_VIEWER
environment variable and try it before falling back to "man".

Signed-off-by: Romain Francoise <romain@orebokech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Fri, 29 Aug 2008 07:16:39 +0000 (00:16 -0700)

Merge branch 'maint'

* maint:
tutorial: gentler illustration of Alice/Bob workflow using gitk
pretty=format: respect date format options
make git-shell paranoid about closed stdin/stdout/stderr
Document gitk --argscmd flag.
Fix '--dirstat' with cross-directory renaming
for-each-ref: Allow a trailing slash in the patterns

git-p4: Fix checkout bug when using --import-local.Tor Arvid Lund Wed, 27 Aug 2008 22:36:12 +0000 (00:36 +0200)

git-p4: Fix checkout bug when using --import-local.

When this option is passed to git p4 clone, the checkout at the end would
previously fail. This patch fixes it by optionally creating the master branch
from refs/heads/p4/master, which is the correct one for this option.

Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
Acked-By: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tutorial: gentler illustration of Alice/Bob workflow... Paolo Ciarrocchi Thu, 28 Aug 2008 12:23:52 +0000 (14:23 +0200)

tutorial: gentler illustration of Alice/Bob workflow using gitk

Update to gitutorial as discussedin the git mailing list:

http://marc.info/?t=121969390900002&r=1&w=2

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pretty=format: respect date format optionsJeff King Fri, 29 Aug 2008 00:54:59 +0000 (20:54 -0400)

pretty=format: respect date format options

When running a command like:

git log --pretty=format:%ad --date=short

the date option was ignored. This patch causes it to use whatever
format was specified by --date (or by --relative-date, etc), just
as the non-user formats would do.

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

make git-shell paranoid about closed stdin/stdout/stderrPaolo Bonzini Wed, 27 Aug 2008 15:20:35 +0000 (17:20 +0200)

make git-shell paranoid about closed stdin/stdout/stderr

It is in general unsafe to start a program with one or more of file
descriptors 0/1/2 closed. Karl Chen for example noticed that stat_command
does this in order to rename a pipe file descriptor to 0:

dup2(from, 0);
close(from);

... but if stdin was closed (for example) from == 0, so that

dup2(0, 0);
close(0);

just ends up closing the pipe. Another extremely rare but nasty problem
would occur if an "important" file ends up in file descriptor 2, and is
corrupted by a call to die().

Fixing this in git was considered to be overkill, so this patch works
around it only for git-shell. The fix is simply to open all the "low"
descriptors to /dev/null in main.

Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Acked-by: Stephen R. van den Berg <srb@cuci.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Document gitk --argscmd flag.Yann Dirson Thu, 28 Aug 2008 22:00:28 +0000 (00:00 +0200)

Document gitk --argscmd flag.

This was part of my original patch, but appears to have been lost.

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

Fix '--dirstat' with cross-directory renamingLinus Torvalds Thu, 28 Aug 2008 23:19:08 +0000 (16:19 -0700)

Fix '--dirstat' with cross-directory renaming

The dirstat code depends on the fact that we always generate diffs with
the names sorted, since it then just does a single-pass walk-over of the
sorted list of names and how many changes there were. The sorting means
that all files are nicely grouped by directory.

That all works fine.

Except when we have rename detection, and suddenly the nicely sorted list
of pathnames isn't all that sorted at all. And now the single-pass dirstat
walk gets all confused, and you can get results like this:

[torvalds@nehalem linux]$ git diff --dirstat=2 -M v2.6.27-rc4..v2.6.27-rc5
3.0% arch/powerpc/configs/
6.8% arch/arm/configs/
2.7% arch/powerpc/configs/
4.2% arch/arm/configs/
5.6% arch/powerpc/configs/
8.4% arch/arm/configs/
5.5% arch/powerpc/configs/
23.3% arch/arm/configs/
8.6% arch/powerpc/configs/
4.0% arch/
4.4% drivers/usb/musb/
4.0% drivers/watchdog/
7.6% drivers/
3.5% fs/

The trivial fix is to add a sorting pass, fixing it to:

[torvalds@nehalem linux]$ git diff --dirstat=2 -M v2.6.27-rc4..v2.6.27-rc5
43.0% arch/arm/configs/
25.5% arch/powerpc/configs/
5.3% arch/
4.4% drivers/usb/musb/
4.0% drivers/watchdog/
7.6% drivers/
3.5% fs/

Spot the difference. In case anybody wonders: it's because of a ton of
renames from {include/asm-blackfin => arch/blackfin/include/asm} that just
totally messed up the file ordering in between arch/arm and arch/powerpc.

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

for-each-ref: Allow a trailing slash in the patternsBjörn Steinbrink Thu, 28 Aug 2008 02:14:02 +0000 (04:14 +0200)

for-each-ref: Allow a trailing slash in the patterns

More often than not, I end up using something like refs/remotes/ as the
pattern for for-each-ref, but that doesn't work, because it expects to see
the slash in the ref name right after the matched pattern. So teach it to
accept the slash as the final character in the pattern as well.

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

list_commands: only call git_exec_path if it is neededAlex Riesen Thu, 28 Aug 2008 17:19:42 +0000 (19:19 +0200)

list_commands: only call git_exec_path if it is needed

Even if it always needed

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

Allow git help work without PATH setAlex Riesen Thu, 28 Aug 2008 17:19:07 +0000 (19:19 +0200)

Allow git help work without PATH set

Just because we can

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

Make main_cmds and other_cmds local to builtin-help.cAlex Riesen Thu, 28 Aug 2008 17:17:46 +0000 (19:17 +0200)

Make main_cmds and other_cmds local to builtin-help.c

These are not used anywhere else.

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

Remove useless memset of static command name lists... Alex Riesen Thu, 28 Aug 2008 17:17:13 +0000 (19:17 +0200)

Remove useless memset of static command name lists in builtin-merge.c

The statics are always initialized with 0

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

Remove calculation of the longest command name from... Alex Riesen Thu, 28 Aug 2008 17:15:33 +0000 (19:15 +0200)

Remove calculation of the longest command name from where it is not used

Just calculate it where it is needed - it is cheap and trivial,
as all the lengths are already there (stored when creating the
command lists).

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

dir.c: Avoid c99 array initializationBrandon Casey Thu, 28 Aug 2008 22:47:22 +0000 (17:47 -0500)

dir.c: Avoid c99 array initialization

The following syntax:

char foo[] = {
[0] = 1,
[7] = 2,
[15] = 3
};

is a c99 construct which some compilers do not support even though they
support other c99 constructs. This construct can be avoided by folding
these 'special' test cases into the sane_ctype array and making use of
the related infrastructure.

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

bash-completion: Add all submodule subcommands to the... Matthias Kestenholz Thu, 28 Aug 2008 08:57:55 +0000 (10:57 +0200)

bash-completion: Add all submodule subcommands to the completion list

Signed-off-by: Matthias Kestenholz <mk@spinlock.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'mv/merge-custom'Junio C Hamano Thu, 28 Aug 2008 00:28:31 +0000 (17:28 -0700)

Merge branch 'mv/merge-custom'

* mv/merge-custom:
t7606: fix custom merge test
Fix "git-merge -s bogo" help text
Update .gitignore to ignore git-help
Builtin git-help.
builtin-help: always load_command_list() in cmd_help()
Add a second testcase for handling invalid strategies in git-merge
Add a new test for using a custom merge strategy
builtin-merge: allow using a custom strategy
builtin-help: make some internal functions available to other builtins

Conflicts:
help.c

Merge branch 'ml/submodule'Junio C Hamano Thu, 28 Aug 2008 00:16:30 +0000 (17:16 -0700)

Merge branch 'ml/submodule'

* ml/submodule:
git-submodule.sh - Remove trailing / from URL if found
git-submodule.sh - Remove trailing / from URL if found

Merge branch 'am/cherry-pick-rerere'Junio C Hamano Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700)

Merge branch 'am/cherry-pick-rerere'

* am/cherry-pick-rerere:
Make cherry-pick use rerere for conflict resolution.

Merge branch 'jc/add-addremove'Junio C Hamano Wed, 27 Aug 2008 23:39:57 +0000 (16:39 -0700)

Merge branch 'jc/add-addremove'

* jc/add-addremove:
builtin-add.c: optimize -A option and "git add ."
builtin-add.c: restructure the code for maintainability

Merge branch 'np/verify-pack'Junio C Hamano Wed, 27 Aug 2008 23:39:46 +0000 (16:39 -0700)

Merge branch 'np/verify-pack'

* np/verify-pack:
discard revindex data when pack list changes

Merge branch 'da/submodule-sync'Junio C Hamano Wed, 27 Aug 2008 23:39:19 +0000 (16:39 -0700)

Merge branch 'da/submodule-sync'

* da/submodule-sync:
git-submodule: add "sync" command

Merge branch 'maint'Junio C Hamano Wed, 27 Aug 2008 23:23:54 +0000 (16:23 -0700)

Merge branch 'maint'

* maint:
ctype.c: protect tiny C preprocessor constants
index-pack: be careful after fixing up the header/footer

ctype.c: protect tiny C preprocessor constantsJunio C Hamano Wed, 27 Aug 2008 23:14:22 +0000 (16:14 -0700)

ctype.c: protect tiny C preprocessor constants

Some platforms contaminate the preprocessor token namespace with their own
definition of SS without being asked. Avoid getting hit by redefinition
warning messages by explicitly undef SS, AA and DD shorthand we use in this
table definition.

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

index-pack: be careful after fixing up the header/footerLinus Torvalds Wed, 27 Aug 2008 19:48:00 +0000 (12:48 -0700)

index-pack: be careful after fixing up the header/footer

The index-pack command, when processing a thin pack, fixed up the pack
after-the-fact. It forgets to fsync the result, because it only did that
in one path rather in all cases of fixup.

This moves the fsync_or_die() to the fix-up routine itself, rather than
doing it in one of the callers, so that all cases are covered.

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

Make it possible to abort the submission of a change... Simon Hausmann Wed, 27 Aug 2008 07:30:29 +0000 (09:30 +0200)

Make it possible to abort the submission of a change to Perforce

Currently it is not possible to skip the submission of a change to Perforce
when running git-p4 submit. This patch compares the modification time before
and after the submit editor invokation and offers a prompt for skipping if
the submit template file was not saved.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'af/maint-install-no-handlink'Junio C Hamano Wed, 27 Aug 2008 00:08:25 +0000 (17:08 -0700)

Merge branch 'af/maint-install-no-handlink'

* af/maint-install-no-handlink:
Makefile: always provide a fallback when hardlinks fail

Merge branch 'jc/no-slim-shell'Junio C Hamano Wed, 27 Aug 2008 00:08:22 +0000 (17:08 -0700)

Merge branch 'jc/no-slim-shell'

* jc/no-slim-shell:
Revert "Build-in "git-shell""

Merge branch 'maint'Junio C Hamano Wed, 27 Aug 2008 00:08:19 +0000 (17:08 -0700)

Merge branch 'maint'

* maint:
index-pack: setup git repository
Suppress some bash redirection error messages
Fix a warning (on cygwin) to allow -Werror
Fix "git log -i --grep"

format-patch: use default diff format even with patch... Jeff King Mon, 25 Aug 2008 02:10:29 +0000 (22:10 -0400)

format-patch: use default diff format even with patch options

Previously, running "git format-patch -U5" would cause the
low-level diff machinery to change the diff output format
from "not specified" to "patch". This meant that
format-patch thought we explicitly specified a diff output
format, and would not use the default format. The resulting
message lacked both the diffstat and the summary, as well as
the separating "---".

Now format-patch explicitly checks for this condition and
uses the default. That means that "git format-patch -p" will
now have the "-p" ignored.

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

index-pack: setup git repositoryNguyễn Thái Ngọc Duy Tue, 26 Aug 2008 14:32:42 +0000 (21:32 +0700)

index-pack: setup git repository

"git index-pack" is an independent command and does not setup git
repository while still need pack.indexversion. It may miss the
info if it is in a subdirectory of the repository.

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

Suppress some bash redirection error messagesRamsay Jones Tue, 26 Aug 2008 17:52:57 +0000 (18:52 +0100)

Suppress some bash redirection error messages

In particular, when testing if the filesystem allows tabs in
filenames, bash issues an error something like:

./t4016-diff-quote.sh: pathname with HT: No such file or directory

which is caused by the failure of the (stdout) redirection,
since the file cannot be created. In order to suppress the
error message, you must redirect stderr to /dev/null, *before*
the stdout redirection on the command-line.

Also, remove a redundant filesystem check from the begining of
the t3902-quoted.sh test and standardise the "test skipped"
message to 'say' on exit.

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

Fix a warning (on cygwin) to allow -WerrorRamsay Jones Tue, 26 Aug 2008 17:50:37 +0000 (18:50 +0100)

Fix a warning (on cygwin) to allow -Werror

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

Makefile: always provide a fallback when hardlinks... Andreas Färber Mon, 25 Aug 2008 15:33:03 +0000 (17:33 +0200)

Makefile: always provide a fallback when hardlinks fail

We make hardlinks from "git" to "git-<cmd>" built-ins and have been
careful to avoid cross-device links when linking "git-<cmd>" to
gitexecdir.

However, we were not prepared to deal with a build directory that is
incapable of making hard links within itself. This patch corrects it.

Instead of temporarily linking "git" to gitexecdir, directly link "git-
add", falling back to "cp". Try hardlinking that as "git-<cmd>", falling
back to symlinks or "cp" on error.

While at it, avoid 100+ error messages from hardlink failures when we are
going to fall back to symlinks or "cp" by redirecting the standard error
to /dev/null.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-submodule: add "sync" commandDavid Aguilar Sun, 24 Aug 2008 19:43:37 +0000 (12:43 -0700)

git-submodule: add "sync" command

When a submodule's URL changes upstream, existing submodules
will be out of sync since their remote."$origin".url will still
be set to the old value.

This adds a "git submodule sync" command that reads submodules'
URLs from .gitmodules and updates them accordingly.

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

Revert "Build-in "git-shell""Junio C Hamano Tue, 26 Aug 2008 05:39:17 +0000 (22:39 -0700)

Revert "Build-in "git-shell""

This reverts commit daa0cc9a92c9c2c714aa5f7da6d0ff65b93e0698.
It was a stupid idea to do this; when run as a log-in shell,
it is spawned with argv[0] set to "-git-shell", so the usual
name-based dispatch would not work to begin with.

Fix "git log -i --grep"Jeff King Mon, 25 Aug 2008 06:15:05 +0000 (02:15 -0400)

Fix "git log -i --grep"

This has been broken in v1.6.0 due to the reorganization of
the revision option parsing code. The "-i" is completely
ignored, but works fine in "git log --grep -i".

What happens is that the code for "-i" looks for
revs->grep_filter; if it is NULL, we do nothing, since there
are no grep filters. But that is obviously not correct,
since we want it to influence the later --grep option. Doing
it the other way around works, since "-i" just impacts the
existing grep_filter option.

Instead, we now always initialize the grep_filter member and
just fill in options and patterns as we get them. This means
that we can no longer check grep_filter for NULL, but
instead must check the pattern list to see if we have any
actual patterns.

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

Install git-shell in bindir, tooTommi Virtanen Sun, 24 Aug 2008 20:23:25 +0000 (23:23 +0300)

Install git-shell in bindir, too

/etc/passwd shell field must be something execable, you can't enter
"/usr/bin/git shell" there. git-shell must be present as a separate
executable, or it is useless.

Signed-off-by: Tommi Virtanen <tv@eagain.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jc/no-slim-shell'Junio C Hamano Sun, 24 Aug 2008 23:14:22 +0000 (16:14 -0700)

Merge branch 'jc/no-slim-shell'

* jc/no-slim-shell:
Build-in "git-shell"
shell: do not play duplicated definition games to shrink the executable

Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano Sun, 24 Aug 2008 21:48:36 +0000 (14:48 -0700)

Merge branch 'maint' to sync with 1.6.0.1

GIT 1.6.0.1 v1.6.0.1Junio C Hamano Sun, 24 Aug 2008 21:47:24 +0000 (14:47 -0700)

GIT 1.6.0.1

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

Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700)

Merge branch 'ag/maint-combine-diff-fix' into maint

* ag/maint-combine-diff-fix:
Respect core.autocrlf in combined diff

Merge branch 'mv/maint-merge-fix' into maintJunio C Hamano Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700)

Merge branch 'mv/maint-merge-fix' into maint

* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area

git-submodule - Use "get_default_remote" from git-parse... Mark Levedahl Sun, 24 Aug 2008 18:46:10 +0000 (14:46 -0400)

git-submodule - Use "get_default_remote" from git-parse-remote

Resolve_relative_url was using its own code for this function, but
this is duplication with the best result that this continues to work.
Replace with the common function provided by git-parse-remote.

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

Documentation: clarify pager configurationJonathan Nieder Sun, 24 Aug 2008 05:28:32 +0000 (00:28 -0500)

Documentation: clarify pager configuration

The unwary user may not know how to disable the -FRSX options.

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

Documentation: clarify pager.<cmd> configurationJonathan Nieder Sun, 24 Aug 2008 05:38:06 +0000 (00:38 -0500)

Documentation: clarify pager.<cmd> configuration

It was not obvious from the text that pager.<cmd> is a boolean
setting.

While we're changing the description, make some other
improvements: lest we forget and fret, clarify that -p and
pager.<cmd> do not kick in when stdout is not a tty; point to
related core.pager and GIT_PAGER settings; use renamed --paginate
option.

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

Clean up the git-p4 documentationSimon Hausmann Sun, 24 Aug 2008 14:12:23 +0000 (16:12 +0200)

Clean up the git-p4 documentation

This patch massages the documentation a bit for improved readability and cleans
it up from outdated options/commands.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Respect core.autocrlf in combined diffAlexander Gavrilov Sat, 23 Aug 2008 19:21:21 +0000 (23:21 +0400)

Respect core.autocrlf in combined diff

Fix git-diff to make it produce useful 3-way diffs for merge conflicts in
repositories with autocrlf enabled. Otherwise it always reports that the
whole file was changed, because it uses the contents from the working tree
without necessary conversion.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UXMiklos Vajna Sat, 23 Aug 2008 22:07:55 +0000 (00:07 +0200)

Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX

In 81cc66a, customization has been added to Makefile for supporting
HP-UX, but git commit is still problematic. This should fix the issue.

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

t7606: fix custom merge testJunio C Hamano Sun, 24 Aug 2008 02:23:22 +0000 (19:23 -0700)

t7606: fix custom merge test

Custom merge strategy does not even kick in when the merge is truly
trivial. The test depended on the behaviour in the git-merge rewritten in
C that broke the trivial merge completely.

Make the test to work on a non-trivial merge to make sure the strategy
kicks in.

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

Merge branch 'maint'Junio C Hamano Sun, 24 Aug 2008 01:28:37 +0000 (18:28 -0700)

Merge branch 'maint'

* maint:
unpack_trees(): protect the handcrafted in-core index from read_cache()
git-p4: Fix one-liner in p4_write_pipe function.
Completion: add missing '=' for 'diff --diff-filter'
Fix 'git help help'

merge: fix numerus bugs around "trivial merge" areaJunio C Hamano Sat, 23 Aug 2008 19:56:57 +0000 (12:56 -0700)

merge: fix numerus bugs around "trivial merge" area

The "trivial merge" codepath wants to optimize itself by making an
internal call to the read-tree machinery, but it does not read the index
before doing so, and the codepath is never exercised. Incidentally, this
failure to read the index upfront means that the safety to refuse doing
anything when the index is unmerged does not kick in, either.

These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().

The primary logic of the merge, however, assumes that the process never
reads the index in-core, and the call to write_cache_as_tree() it makes
from write_tree_trivial() will always read from the on-disk index that is
prepared the strategy back-ends. This assumption is now broken by the
above fix. To fix this issue, we now call discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree.

When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one read by the previous round.

Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.

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

unpack_trees(): protect the handcrafted in-core index... Junio C Hamano Sat, 23 Aug 2008 19:57:30 +0000 (12:57 -0700)

unpack_trees(): protect the handcrafted in-core index from read_cache()

unpack_trees() rebuilds the in-core index from scratch by allocating a new
structure and finishing it off by copying the built one to the final
index.

The resulting in-core index is Ok for most use, but read_cache() does not
recognize it as such. The function is meant to be no-op if you already
have loaded the index, until you call discard_cache().

This change the way read_cache() detects an already initialized in-core
index, by introducing an extra bit, and marks the handcrafted in-core
index as initialized, to avoid this problem.

A better fix in the longer term would be to change the read_cache() API so
that it will always discard and re-read from the on-disk index to avoid
confusion. But there are higher level API that have relied on the current
semantics, and they and their users all need to get converted, which is
outside the scope of 'maint' track.

An example of such a higher level API is write_cache_as_tree(), which is
used by git-write-tree as well as later Porcelains like git-merge, revert
and cherry-pick. In the longer term, we should remove read_cache() from
there and add one to cmd_write_tree(); other callers expect that the
in-core index they prepared is what gets written as a tree so no other
change is necessary for this particular codepath.

The original version of this patch marked the index by pointing an
otherwise wasted malloc'ed memory with o->result.alloc, but this version
uses Linus's idea to use a new "initialized" bit, which is conceptually
much cleaner.

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

git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund Thu, 21 Aug 2008 21:11:40 +0000 (23:11 +0200)

git-p4: Fix one-liner in p4_write_pipe function.

The function built a p4 command string via the p4_build_cmd function, but
ignored the result.

Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-submodule: replace duplicated code with a module_li... David Aguilar Fri, 22 Aug 2008 07:30:50 +0000 (00:30 -0700)

git-submodule: replace duplicated code with a module_list function

Several call sites in git-submodule.sh used the same idiom for getting
submodule information:

git ls-files --stage -- "$@" | grep '^160000 '

This patch removes this duplication by introducing a module_list function.

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

discard revindex data when pack list changesNicolas Pitre Fri, 22 Aug 2008 19:45:53 +0000 (15:45 -0400)

discard revindex data when pack list changes

This is needed to fix verify-pack -v with multiple pack arguments.

Also, in theory, revindex data (if any) must be discarded whenever
reprepare_packed_git() is called. In practice this is hard to trigger
though.

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

git-merge documentation: more details about resolving... Dan Hensgen Fri, 22 Aug 2008 03:32:00 +0000 (23:32 -0400)

git-merge documentation: more details about resolving conflicts

Signed-off-by: Dan Hensgen <dan@methodhead.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Extend "checkout --track" DWIM to support more casesAlex Riesen Thu, 21 Aug 2008 17:23:20 +0000 (19:23 +0200)

Extend "checkout --track" DWIM to support more cases

The code handles additionally "refs/remotes/<something>/name",
"remotes/<something>/name", and "refs/<namespace>/name".

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

Revert "Convert output messages in merge-recursive... Jonathan del Strother Fri, 22 Aug 2008 17:18:44 +0000 (18:18 +0100)

Revert "Convert output messages in merge-recursive to past tense."

During a conflicting merge, you would typically see:

Auto-merged foo.txt
CONFLICT (content): Merge conflict in foo.txt
Recorded preimage for 'foo.txt'
Automatic merge failed; fix conflicts and then commit the result.

and left wondering what happened to "foo.txt". Did it succeed, and then
conflicted, and then what?

This is because historically there was a progress bar displayed before the
auto-merge is mentioned, and it was expected to take long time, before we
can say "Auto-merged foo.txt". It turns out it was not the case, and the
original wording "Auto-merging foo.txt" we used to have before 89f40be
(Convert output messages in merge-recursive to past tense., 2007-01-14) is
better.

Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Completion: add missing '=' for 'diff --diff-filter'Eric Raible Fri, 22 Aug 2008 17:25:06 +0000 (10:25 -0700)

Completion: add missing '=' for 'diff --diff-filter'

Signed-off-by: Eric Raible <raible@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

templates/Makefile: install is unnecessary, just use... Junio C Hamano Fri, 22 Aug 2008 00:31:50 +0000 (19:31 -0500)

templates/Makefile: install is unnecessary, just use mkdir -p

The native install on some platforms (namely IRIX 6.5) treats non-absolute
paths as being relative to the root directory rather than relative to
the current directory. Work around this by avoiding install in this case
since it is unnecessary, and instead depend on the local umask setting
and use mkdir.

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

remote.c: add a function for deleting a refspec array... Brandon Casey Fri, 22 Aug 2008 00:16:30 +0000 (19:16 -0500)

remote.c: add a function for deleting a refspec array and use it (twice)

A number of call sites allocate memory for a refspec array, populate
its members with heap memory, and then free only the refspec pointer
while leaking the memory allocated for the member elements. Provide
a function for freeing the elements of a refspec array and the array
itself.

Caution to callers: code paths must be checked to ensure that the
refspec members "src" and "dst" can be passed to free.

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

filter-branch: Grok special characters in tag namesJohannes Sixt Thu, 21 Aug 2008 14:45:11 +0000 (16:45 +0200)

filter-branch: Grok special characters in tag names

The tag rewriting code used a 'sed' expression to substitute the new tag
name into the corresponding field of the annotated tag object. But this is
problematic if the tag name contains special characters. In particular,
if the tag name contained a slash, then the 'sed' expression had a syntax
error. We now protect against this by using 'printf' to assemble the
tag header.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

test-lib: do not remove trash_directory if called with... Johannes Schindelin Thu, 21 Aug 2008 07:49:12 +0000 (09:49 +0200)

test-lib: do not remove trash_directory if called with --debug

Sometimes you want to keep the trash directory, even if all tests
passed. For example, when extending tests, it comes it quite handy.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

provide more errors for the "merge into empty head... Paolo Bonzini Thu, 21 Aug 2008 12:14:18 +0000 (14:14 +0200)

provide more errors for the "merge into empty head" case

A squash merge into an unborn branch could be implemented by building the
index from the merged-from branch, and doing a single commit, but this is
not supported yet.

A non-fast-forward merge into an unborn branch does not make any sense,
because you cannot make a merge commit if you don't have a commit to use
as the parent.

Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make reflog query '@{1219188291}' act as '@{2008.8... Shawn O. Pearce Thu, 21 Aug 2008 15:40:44 +0000 (08:40 -0700)

Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'

As we support seconds-since-epoch in $GIT_COMMITTER_TIME we should
also support it in a reflog @{...} style notation. We can easily
tell this part from @{nth} style notation by looking to see if the
value is unreasonably large for an @{nth} style notation.

The value 100000000 was chosen as it is already used by date.c to
disambiguate yyyymmdd format from a seconds-since-epoch time value.

A reflog with 100,000,000 record entries is also simply not valid.
Such a reflog would require at least 7.7 GB to store just the old
and new SHA-1 values. So our randomly chosen upper limit for @{nth}
notation is "big enough".

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

config.mak.in: Pass on LDFLAGS from configureNeil Roberts Thu, 21 Aug 2008 19:38:23 +0000 (20:38 +0100)

config.mak.in: Pass on LDFLAGS from configure

The configure script allows you to specify flags to pass to the linker
step in the LDFLAGS environment variable but this was being ignored in
the Makefile. Now a make variable gets set to the value passed down
from the configure script.

Signed-off-by: Neil Roberts <bpeeluk@yahoo.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-submodule.sh - Remove trailing / from URL if foundMark Levedahl Thu, 21 Aug 2008 23:54:01 +0000 (19:54 -0400)

git-submodule.sh - Remove trailing / from URL if found

git clone does not complain if a trailing '/' is included in the origin
URL, but doing so causes resolution of a submodule's URL relative to the
superproject to fail. Trailing /'s are likely when cloning locally using
tab-completion, so the slash may appear in either superproject or
submodule URL. So, ignore the trailing slash if it already exists in
the superproject's URL, and don't record one for the submodule (which
could itself have submodules...).

The problem I'm trying to fix is that a number of folks have
superprojects checked out where the recorded origin URL has a trailing
/, and a submodule has its origin in a directory sitting right next to
the superproject on the server. Thus, we have:

superproject url = server:/public/super
submodoule url = server:/public/sub1

However, in the checked out superproject's .git/config

[remote "origin"]
url = server:/public/super/

and for similar reasons, the submodule has its URL recorded in .gitmodules as
[submodule "sub"]

path = submodule1
url = ../sub1/

resolve_relative_url gets the submodule's recorded url as $1, which
the caller retrieved from .gitmodules, and retrieves the superprojects
origin from .git/config. So in this case resolve_relative_url has
that:

url = ../sub1/
remoteurl = server:/public/super/

So, without any patch, resolve_relative_url computes the submodule's URL as:

server:/public/super/sub1/

rather than

server:/public/sub1

In summary, it is essential that resolve_relative_url strip the
trailing / from the superproject's url before starting, and
beneficial if it assures that the result does not contain
a trailing / as the submodule may itself also be a superproject.

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

Fix 'git help help'Miklos Vajna Thu, 21 Aug 2008 14:21:48 +0000 (16:21 +0200)

Fix 'git help help'

git help foo invokes man git-foo if foo is a git command, otherwise it
invokes man gitfoo. 'help' is not a git command, but the manual page is
called git-help, so add this special exception.

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

Merge branch 'maint'Junio C Hamano Thu, 21 Aug 2008 08:54:49 +0000 (01:54 -0700)

Merge branch 'maint'

* maint:
compat/snprintf.c: handle snprintf's that always return the # chars transmitted
git-svn: fix dcommit to urls with embedded usernames
revision.h: make show_early_output an extern which is defined in revision.c

compat/snprintf.c: handle snprintf's that always return... Brandon Casey Thu, 21 Aug 2008 01:53:50 +0000 (20:53 -0500)

compat/snprintf.c: handle snprintf's that always return the # chars transmitted

Some platforms provide a horribly broken snprintf. More broken than the
platforms that return -1 when there is too little space in the target buffer
for the formatted string. Some platforms provide an snprintf which _always_
returns the number of characters transmitted to the buffer, regardless of
whether there was enough space or not.

IRIX 6.5 is such a platform. IRIX does have a working snprintf(), but it
is only provided when _NO_XOPEN5 evaluates to zero, and this only happens
if _XOPEN_SOURCE is defined, but definition of _XOPEN_SOURCE prevents
inclusion of many other common functions and defines. So it must be avoided.

Work around these horribly broken snprintf implementations by detecting an
snprintf call which results in the number of transmitted characters exactly
equal to the length of our buffer and retrying with a larger buffer just to
be safe.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Teach "git diff -p" HTML funcname patternsJohan Herland Wed, 20 Aug 2008 17:49:15 +0000 (19:49 +0200)

Teach "git diff -p" HTML funcname patterns

Find lines with <h1>..<h6> tags.

[jc: while at it, reordered entries to sort alphabetically.]

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Teach "git diff -p" Python funcname patternsKirill Smelkov Wed, 20 Aug 2008 15:57:07 +0000 (19:57 +0400)

Teach "git diff -p" Python funcname patterns

Find classes, functions, and methods definitions.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: fix dcommit to urls with embedded usernamesEric Wong Wed, 20 Aug 2008 07:30:06 +0000 (00:30 -0700)

git-svn: fix dcommit to urls with embedded usernames

Don't rely on the extracted URL from working_head_info since that has the
username removed. Instead use the $gs->full_url method (as before with
ba24e74 (git-svn: add ability to specify --commit-url for dcommit,
2008-08-07)) to give us the URL to commit to if --commit-url is not
specified.

Aditionally, since we clean usernames from URLs, checking the URL after
rebase can fail because it doesn't match the URL we used to commit; so
unconditionally provide a username-free URL for checking the result of the
refetch.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ml/submodule-foreach'Junio C Hamano Thu, 21 Aug 2008 06:42:33 +0000 (23:42 -0700)

Merge branch 'ml/submodule-foreach'

* ml/submodule-foreach:
git-submodule - Add 'foreach' subcommand

Merge branch 'pm/log-exit-code'Junio C Hamano Thu, 21 Aug 2008 06:42:29 +0000 (23:42 -0700)

Merge branch 'pm/log-exit-code'

* pm/log-exit-code:
Teach git log --exit-code to return an appropriate exit code
Teach git log --check to return an appropriate exit code

Merge branch 'sb/commit-tree-minileak'Junio C Hamano Thu, 21 Aug 2008 06:42:26 +0000 (23:42 -0700)

Merge branch 'sb/commit-tree-minileak'

* sb/commit-tree-minileak:
Fix commit_tree() buffer leak

Merge branch 'pb/reflog-dwim'Junio C Hamano Thu, 21 Aug 2008 06:42:22 +0000 (23:42 -0700)

Merge branch 'pb/reflog-dwim'

* pb/reflog-dwim:
builtin-reflog: Allow reflog expire to name partial ref

Merge branch 'jc/add-stop-at-symlink'Junio C Hamano Thu, 21 Aug 2008 06:42:18 +0000 (23:42 -0700)

Merge branch 'jc/add-stop-at-symlink'

* jc/add-stop-at-symlink:
add: refuse to add working tree items beyond symlinks
update-index: refuse to add working tree items beyond symlinks

Merge branch 'kh/diff-tree'Junio C Hamano Thu, 21 Aug 2008 06:41:59 +0000 (23:41 -0700)

Merge branch 'kh/diff-tree'

* kh/diff-tree:
Add test for diff-tree --stdin with two trees
Teach git diff-tree --stdin to diff trees
diff-tree: Note that the commit ID is printed with --stdin
Refactoring: Split up diff_tree_stdin

Merge branch 'mg/count-objects'Junio C Hamano Thu, 21 Aug 2008 06:41:54 +0000 (23:41 -0700)

Merge branch 'mg/count-objects'

* mg/count-objects:
count-objects: Add total pack size to verbose output

Merge branch 'mz/push-verbose'Junio C Hamano Thu, 21 Aug 2008 06:41:51 +0000 (23:41 -0700)

Merge branch 'mz/push-verbose'

* mz/push-verbose:
Make push more verbose about illegal combination of options

Merge branch 'jc/index-extended-flags'Junio C Hamano Thu, 21 Aug 2008 06:41:47 +0000 (23:41 -0700)

Merge branch 'jc/index-extended-flags'

* jc/index-extended-flags:
index: future proof for "extended" index entries

Merge branch 'cc/merge-base-many'Junio C Hamano Thu, 21 Aug 2008 06:41:38 +0000 (23:41 -0700)

Merge branch 'cc/merge-base-many'

* cc/merge-base-many:
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
merge-base-many: add trivial tests based on the documentation
documentation: merge-base: explain "git merge-base" with more than 2 args
merge-base: teach "git merge-base" to drive underlying merge_bases_many()

Merge branch 'jc/test-deeper'Junio C Hamano Thu, 21 Aug 2008 06:40:59 +0000 (23:40 -0700)

Merge branch 'jc/test-deeper'

* jc/test-deeper:
tests: use $TEST_DIRECTORY to refer to the t/ directory

Merge branch 'js/parallel-test'Junio C Hamano Thu, 21 Aug 2008 06:40:56 +0000 (23:40 -0700)

Merge branch 'js/parallel-test'

* js/parallel-test:
Update t/.gitignore to ignore all trash directories
Enable parallel tests
tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
t9700: remove useless check

git-submodule.sh - Remove trailing / from URL if foundMark Levedahl Wed, 20 Aug 2008 02:18:23 +0000 (22:18 -0400)

git-submodule.sh - Remove trailing / from URL if found

git clone does not complain if a trailing '/' is included in the origin
URL, but doing so causes resolution of a submodule's URL relative to the
superproject to fail. Regardless of whether git is changed to remove the
trailing / before recording the URL, we should avoid this issue in
submodule as existing repositories can have this problem.

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

Fix "git-merge -s bogo" help textJunio C Hamano Thu, 21 Aug 2008 05:07:55 +0000 (22:07 -0700)

Fix "git-merge -s bogo" help text

It does not make much sense to reuse the output code from "git help" to
show the list of commands to the standard output while giving the error
message before that to the standard error stream. This makes the output
consistent to that of the 1.6.0 version of "git merge".

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

revision.h: make show_early_output an extern which... Brandon Casey Thu, 21 Aug 2008 00:34:30 +0000 (19:34 -0500)

revision.h: make show_early_output an extern which is defined in revision.c

The variable show_early_output is defined in revision.c and should be
declared extern in revision.h so that the linker does not complain
about multiply defined variables.

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

Update draft release notes for 1.6.1Junio C Hamano Wed, 20 Aug 2008 23:32:15 +0000 (16:32 -0700)

Update draft release notes for 1.6.1

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

Merge branch 'maint'Junio C Hamano Wed, 20 Aug 2008 23:18:16 +0000 (16:18 -0700)

Merge branch 'maint'

* maint:
Update draft release notes for 1.6.0.1
Add hints to revert documentation about other ways to undo changes
Install templates with the user and group of the installing personality
"git-merge": allow fast-forwarding in a stat-dirty tree
completion: find out supported merge strategies correctly
decorate: allow const objects to be decorated
for-each-ref: cope with tags with incomplete lines
diff --check: do not get confused by new blank lines in the middle
remote.c: remove useless if-before-free test
mailinfo: avoid violating strbuf assertion
git format-patch: avoid underrun when format.headers is empty or all NLs

Update draft release notes for 1.6.0.1Junio C Hamano Wed, 20 Aug 2008 22:19:00 +0000 (15:19 -0700)

Update draft release notes for 1.6.0.1

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

Add hints to revert documentation about other ways... Tarmigan Casebolt Tue, 19 Aug 2008 19:50:31 +0000 (12:50 -0700)

Add hints to revert documentation about other ways to undo changes

Based on its name, people may read the 'git revert' documentation when
they want to undo local changes, especially people who have used other
SCM's. 'git revert' may not be what they had in mind, but git
provides several other ways to undo changes to files. We can help
them by pointing them towards the git commands that do what they might
want to do.

Cc: Daniel Barkalow <barkalow@iabervon.org>
Cc: Lea Wiemann <lewiemann@gmail.com>
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Install templates with the user and group of the instal... Johannes Sixt Wed, 20 Aug 2008 15:36:25 +0000 (17:36 +0200)

Install templates with the user and group of the installing personality

If 'make install' was run with sufficient privileges, then the installed
templates, which are copied using 'tar', would receive the user and group
of whoever built git. This instructs 'tar' to ignore the user and group
that are recorded in the archive.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

"git-merge": allow fast-forwarding in a stat-dirty... Junio C Hamano Wed, 20 Aug 2008 22:09:28 +0000 (15:09 -0700)

"git-merge": allow fast-forwarding in a stat-dirty tree

We used to refresh the index to clear stat-dirtyness before a fast-forward
merge. Recent C rewrite forgot to do this.

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

completion: find out supported merge strategies correctlyJunio C Hamano Wed, 20 Aug 2008 21:13:42 +0000 (14:13 -0700)

completion: find out supported merge strategies correctly

"git-merge" is a binary executable these days, and looking for assignment
to $all_strategies variable with grep/sed does not work well.

When asked for an unknown strategy, pre-1.6.0 and post-1.6.0 "git merge"
commands respectively say:

$ $HOME/git-snap-v1.5.6.5/bin/git merge -s help
available strategies are: recur recursive octopus resolve stupid ours subtree
$ $HOME/git-snap-v1.6.0/bin/git merge -s help
Could not find merge strategy 'help'.
Available strategies are: recursive octopus resolve ours subtree.

both on their standard error stream. We can use this to learn what
strategies are supported.

The sed script is written in such a way that it catches both old and new
message styles ("Available" vs "available", and the full stop at the end).
It also allows future versions of "git merge" to line-wrap the list of
strategies, and add extra comments, like this:

$ $HOME/git-snap-v1.6.1/bin/git merge -s help
Could not find merge strategy 'help'.
Available strategies are: blame recursive octopus resolve ours
subtree.
Also you have custom strategies: theirs

Make sure you spell strategy names correctly.

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

decorate: allow const objects to be decoratedJeff King Wed, 20 Aug 2008 17:55:33 +0000 (13:55 -0400)

decorate: allow const objects to be decorated

We don't actually modify the struct object, so there is no
reason not to accept const versions (and this allows other
callsites, like the next patch, to use the decoration
machinery).

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

for-each-ref: cope with tags with incomplete linesJunio C Hamano Wed, 20 Aug 2008 19:29:27 +0000 (12:29 -0700)

for-each-ref: cope with tags with incomplete lines

If you have a tag with a single, incomplete line as its payload, asking
git-for-each-ref for its %(body) element accessed a NULL pointer.

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

diff --check: do not get confused by new blank lines... Junio C Hamano Wed, 20 Aug 2008 18:47:55 +0000 (11:47 -0700)

diff --check: do not get confused by new blank lines in the middle

The code remembered that the last diff output it saw was an empty line,
and tried to reset that state whenever it sees a context line, a non-blank
new line, or a new hunk. However, this codepath asks the underlying diff
engine to feed diff without any context, and the "just saw an empty line"
state was not reset if you added a new blank line in the last hunk of your
patch, even if it is not the last line of the file.

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

Build-in "git-shell"Junio C Hamano Wed, 20 Aug 2008 01:05:43 +0000 (18:05 -0700)

Build-in "git-shell"

This trivially makes "git-shell" a built-in. It makes the executable even
fatter, though.

And MinGW removed git-shell only because of the funny dependencies; there
is no reason to do so anymore.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-on-MinGW-by: Johannes Sixt <johannes.sixt@telecom.at>