gitweb.git
git-svn: fix dcommit clobbering upstream when committin... Eric Wong Sat, 1 Sep 2007 01:16:12 +0000 (18:16 -0700)

git-svn: fix dcommit clobbering upstream when committing multiple changes

Although dcommit could detect if the first commit in the series
would conflict with the HEAD revision in SVN, it could not
detect conflicts in further commits it made.

Now we rebase each uncommitted change after each revision is
committed to SVN to ensure that we are up-to-date. git-rebase
will bail out on conflict errors if our next change cannot be
applied and committed to SVN cleanly, preventing accidental
clobbering of changes on the SVN-side.

--no-rebase users will have trouble with this, and are thus
warned if they are committing more than one commit. Fixing this
for (hopefully uncommon) --no-rebase users would be more complex
and will probably happen at a later date.

Thanks to David Watson for finding this and the original test.

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

git-svn: Protect against "diff.color = true".Junio C Hamano Fri, 31 Aug 2007 21:29:49 +0000 (14:29 -0700)

git-svn: Protect against "diff.color = true".

If the configuration of the user has "diff.color = true", the
output from "log" we invoke internally added color codes, which
broke the parser.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Eric Wong <normalperson@yhbt.net>

filter-branch: introduce convenience function "skip_commit"Johannes Schindelin Fri, 31 Aug 2007 19:06:27 +0000 (20:06 +0100)

filter-branch: introduce convenience function "skip_commit"

With this function, a commit filter can leave out unwanted commits
(such as temporary commits). It does _not_ undo the changeset
corresponding to that commit, but it _skips_ the revision. IOW
no tree object is changed by this.

If you like to commit early and often, but want to filter out all
intermediate commits, marked by "@@@" in the commit message, you can
now do this with

git filter-branch --commit-filter '
if git cat-file commit $GIT_COMMIT | grep '@@@' > /dev/null;
then
skip_commit "$@";
else
git commit-tree "$@";
fi' newbranch

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

filter-branch: provide the convenience functions also... Johannes Schindelin Fri, 31 Aug 2007 19:05:36 +0000 (20:05 +0100)

filter-branch: provide the convenience functions also for commit filters

Move the convenience functions to the top of git-filter-branch.sh, and
return from the script when the environment variable SOURCE_FUNCTIONS is
set.

By sourcing git-filter-branch with that variable set automatically, all
commit filters may access the convenience functions like "map".

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

rebase -i: mention the option to split commits in the... Johannes Schindelin Fri, 31 Aug 2007 17:10:21 +0000 (18:10 +0100)

rebase -i: mention the option to split commits in the man page

The interactive mode of rebase can be used to split commits. Tell the
interested parties about it, with a dedicated section in the man page.

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

filter-branch: fix remnants of old syntax in documentationJohannes Schindelin Fri, 31 Aug 2007 16:42:33 +0000 (17:42 +0100)

filter-branch: fix remnants of old syntax in documentation

Some time ago, filter-branch's syntax changed so that more than one
ref can be rewritten at the same time. This involved the removal of
the ref name for the result; instead, the refs are rewritten in-place.

This updates the last leftovers in the documentation to reflect the
new behavior.

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

Teach bash about completing arguments for git-tagShawn O. Pearce Sat, 1 Sep 2007 03:47:01 +0000 (23:47 -0400)

Teach bash about completing arguments for git-tag

Lately I have been doing a lot of calls to `git tag -d` and also to
`git tag -v`. In both such cases being able to complete the names
of existing tags saves the fingers some typing effort. We now look
for the -d or -v option to git-tag in the bash completion support
and offer up existing tag names as possible choices for these.

When creating a new tag we now also offer bash completion support
for the second argument to git-tag (the object to be tagged) as this
can often be a specific existing branch name and is not necessarily
the current HEAD.

If the -f option is being used to recreate an existing tag we now
also offer completion support on the existing tag names for the
first argument of git-tag, helping to the user to reselect the
prior tag name that they are trying to replace.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Hopefully the final update to draft release notes for... Junio C Hamano Fri, 31 Aug 2007 07:35:36 +0000 (00:35 -0700)

Hopefully the final update to draft release notes for 1.5.3.

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

Make "git-log --" without paths behave the same as... Junio C Hamano Fri, 31 Aug 2007 05:58:26 +0000 (22:58 -0700)

Make "git-log --" without paths behave the same as "git-log" without --

"git log" family of commands, even when run from a subdirectory,
do not limit the revision range with the current directory as
the path limiter, but with double-dash without any paths after
it, i.e. "git log --" do so. It was a mistake to have a
difference between "git log --" and "git log" introduced in
commit ae563542bf10fa8c33abd2a354e4b28aca4264d7 (First cut at
libifying revlist generation).

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

git-init: autodetect core.symlinksJunio C Hamano Fri, 31 Aug 2007 07:25:04 +0000 (00:25 -0700)

git-init: autodetect core.symlinks

We already autodetect if filemode is reliable on the filesystem
to deal with VFAT and friends. Do the same for symbolic link
support.

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

Make git-archimport log entries more consistentMiles Bader Thu, 30 Aug 2007 01:56:56 +0000 (21:56 -0400)

Make git-archimport log entries more consistent

When appending the "git-archimport-id:" line to the end of log entries,
git-archimport would use two blank lines as a separator when there was no
body in the arch log (only a Summary: line), and zero blank lines when there
was a body (making it hard to see the break between the actual log message
and the git-archimport-id: line).

This patch makes git-archimport generate one blank line as a separator in all
cases.

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

fix same sized delta logicNicolas Pitre Thu, 30 Aug 2007 01:17:17 +0000 (21:17 -0400)

fix same sized delta logic

The code favoring shallower deltas when size is equal was triggered
only when previous delta was also cached. There should be no relation
between cached deltas and same sized deltas.

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

filter-branch: make sure orig_namespace ends with a... Junio C Hamano Fri, 31 Aug 2007 02:17:42 +0000 (19:17 -0700)

filter-branch: make sure orig_namespace ends with a single slash.

Later in a loop any existing ref whose path begins with it is
removed. It would be a disaster if you allowed it to say refs/head
for example.

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

git-filter-branch: document --original optionGiuseppe Bilotta Thu, 30 Aug 2007 17:10:42 +0000 (19:10 +0200)

git-filter-branch: document --original option

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-filter-branch: more detailed USAGEGiuseppe Bilotta Thu, 30 Aug 2007 17:10:41 +0000 (19:10 +0200)

git-filter-branch: more detailed USAGE

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: do not allow gnu make to remove test-*.o... Junio C Hamano Fri, 31 Aug 2007 02:14:31 +0000 (19:14 -0700)

Makefile: do not allow gnu make to remove test-*.o files

It appears parallel build (-j) gets confused.

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

Temporary fix for stack smashing in mailinfoAlex Riesen Thu, 30 Aug 2007 21:48:24 +0000 (23:48 +0200)

Temporary fix for stack smashing in mailinfo

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

Fixing comment in merge strategiesTom Clarke Thu, 30 Aug 2007 21:12:44 +0000 (23:12 +0200)

Fixing comment in merge strategies

Comments in both these strategies refer to the wrong number
of remotes

Signed-off-by: Tom Clarke <tom@u2i.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

ls-files --error-unmatch: do not barf if the same patte... Junio C Hamano Thu, 30 Aug 2007 06:12:38 +0000 (23:12 -0700)

ls-files --error-unmatch: do not barf if the same pattern is given twice.

This is most visible when you do "git commit Makefile Makefile"; it
may be a stupid request, but that is not a reason to fail the command.

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

Merge branch 'master' of git://git./gitk/gitkJunio C Hamano Wed, 29 Aug 2007 20:27:10 +0000 (13:27 -0700)

Merge branch 'master' of git://git./gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix bug causing undefined variable error when cherry-picking

completion: also complete git-log's --left-right and... Johannes Schindelin Wed, 29 Aug 2007 14:15:34 +0000 (15:15 +0100)

completion: also complete git-log's --left-right and --cherry-pick option

Both --left-right and --cherry-pick are particularly long to type, so
help the user there.

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

gitk: Fix bug causing undefined variable error when... Paul Mackerras Wed, 29 Aug 2007 12:41:34 +0000 (22:41 +1000)

gitk: Fix bug causing undefined variable error when cherry-picking

When "Show nearby tags" is turned off and the user did a cherry-pick,
we were trying to access variables relating to the descendent/ancestor
tag & head computations in addnewchild though they hadn't been set.
This makes sure we don't do that. Reported by Johannes Sixt.

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

git-daemon(1): assorted improvements.Junio C Hamano Wed, 29 Aug 2007 10:32:12 +0000 (03:32 -0700)

git-daemon(1): assorted improvements.

Jari Aalto noticed a handful places in git-daemon documentation
that need to be improved.

* --inetd makes --pid-file to be ignored, in addition to --user
and --group

* receive-pack service was not described at all. We should, if
only to warn about the security implications of it.

* There was no example of per repository configuration.

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

GIT 1.5.3-rc7 v1.5.3-rc7Junio C Hamano Wed, 29 Aug 2007 07:11:27 +0000 (00:11 -0700)

GIT 1.5.3-rc7

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

git-svn.txt: fix an obvious misspelling.David Kastrup Fri, 17 Aug 2007 15:48:53 +0000 (17:48 +0200)

git-svn.txt: fix an obvious misspelling.

Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git.el: Added colors for dark backgroundDavid Kågedal Mon, 27 Aug 2007 09:50:12 +0000 (11:50 +0200)

git.el: Added colors for dark background

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

format-patch documentation: reword to hint "--root... Junio C Hamano Wed, 29 Aug 2007 04:58:53 +0000 (21:58 -0700)

format-patch documentation: reword to hint "--root <one-commit>" more clearly

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

Merge branch 'jc/logsemantics'Junio C Hamano Wed, 29 Aug 2007 04:49:01 +0000 (21:49 -0700)

Merge branch 'jc/logsemantics'

* jc/logsemantics:
"format-patch --root rev" is the way to show everything.
Porcelain level "log" family should recurse when diffing.

Documentation/git-diff: A..B and A...B cannot take... Junio C Hamano Wed, 29 Aug 2007 04:47:08 +0000 (21:47 -0700)

Documentation/git-diff: A..B and A...B cannot take tree-ishes

As pointed out by Linus, these notations require the endpoints
given by the end user to be commits. Clarify.

Also, three-dots in AsciiDoc are turned into ellipses unless
quoted with bq. Be careful.

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

git-add: Make the filename globbing note a bit clearerPetr Baudis Tue, 28 Aug 2007 22:41:28 +0000 (00:41 +0200)

git-add: Make the filename globbing note a bit clearer

I think the trick with Git-side filename globbing is important and perhaps
not that well known. Clarify a bit in git-add documentation what it means.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-add: Make the "tried to add ignored file" error... Petr Baudis Tue, 28 Aug 2007 22:41:23 +0000 (00:41 +0200)

git-add: Make the "tried to add ignored file" error message less confusing

Currently the error message seems to imply (at least to me) that only
the listed files were withheld and the rest of the files was added to the
index, even though that's obviously not the case.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Fix escaping HTML of project owner in 'projects... Jakub Narebski Tue, 28 Aug 2007 14:05:43 +0000 (16:05 +0200)

gitweb: Fix escaping HTML of project owner in 'projects_list' and
'summary' views

This for example allows to put email address in the project owner
field in the projects index file (when $projects_list points to
a file, and not to a directory), in the form of:

path/to/repo.git Random+J+Developer+<random@developer.example.org>

Noticed-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

"format-patch --root rev" is the way to show everything.Junio C Hamano Tue, 28 Aug 2007 07:38:48 +0000 (00:38 -0700)

"format-patch --root rev" is the way to show everything.

We used to trigger the special case "things not in origin"
semantics only when one and only one positive ref is given, and
no number (e.g. "git format-patch -4 origin") was specified, and
used the general revision range semantics for everything else.

This narrows the special case a bit more, by making:

git format-patch --root this_version

to show everything that leads to the named commit.

More importantly, document the two different semantics better.
The generic revision range semantics came later and bolted on
without being clearly documented.

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

Porcelain level "log" family should recurse when diffing.Junio C Hamano Mon, 27 Aug 2007 08:33:49 +0000 (01:33 -0700)

Porcelain level "log" family should recurse when diffing.

Most notably, "git log --name-status" stopped at top level
directory changes without "-r" option.

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

git-merge: do up-to-date check also for all strategiesJunio C Hamano Thu, 16 Aug 2007 06:19:55 +0000 (23:19 -0700)

git-merge: do up-to-date check also for all strategies

This clarifies the logic to omit fast-forward check and omit
trivial merge before running the specified strategy.

The "index_merge" variable started out as a flag to say "do not
do anything clever", but when recursive was changed to skip the
trivial merge, the semantics were changed and the variable alone
does not make sense anymore.

This splits the variable into two, allow_fast_forward (which is
almost always true, and avoids making a merge commit when the
other commit is a descendant of our branch, but is set to false
for ours and subtree) and allow_trivial_merge (which is false
for ours, recursive and subtree).

Unlike the earlier implementation, the "ours" strategy allows an
up-to-date condition. When we are up-to-date, the result will
be our commit, and by definition, we will have our tree as the
result.

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

git --bare cmd: do not unconditionally nuke GIT_DIRJunio C Hamano Tue, 28 Aug 2007 05:41:23 +0000 (22:41 -0700)

git --bare cmd: do not unconditionally nuke GIT_DIR

"GIT_DIR=some.where git --bare cmd" and worse yet
"git --git-dir=some.where --bare cmd" were very confusing. They
both ignored git-dir specified, and instead made $cwd as GIT_DIR.

This changes --bare not to override existing GIT_DIR.

This has been like this for a long time. Let's hope nobody sane
relied on this insane behaviour.

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

Fix initialization of a bare repositoryJunio C Hamano Mon, 27 Aug 2007 07:58:06 +0000 (00:58 -0700)

Fix initialization of a bare repository

Here is my attempt to fix this with a minimally intrusive patch.

* As "git --bare init" cannot tell if it was called with --bare or
just "GIT_DIR=. git init", I added an explicit assignment of
is_bare_repository_cfg on the codepath for "git --bare".

* GIT_WORK_TREE alone without GIT_DIR does not make any sense,
nor GIT_WORK_TREE with an explicit "git --bare". Catch that
mistake. It might make sense to move this check to "git.c"
side as well, but I tried to shoot for the minimum change for
now.

* Some scripts, especially from the olden days, rely on
traditional GIT_DIR behaviour in "git init". Namely, these
are some notable patterns:

(create a bare repository)
- mkdir some.git && cd some.git && GIT_DIR=. git init
- mkdir some.git && cd some.git && git --bare init

(create a non-bare repository)
- mkdir .git && GIT_DIR=.git git init
- mkdir .git && GIT_DIR=`pwd`/.git git init

This comes with a new test script and also passes the existing
test suite, but there may be cases that are still broken with
the current tip of master and this patch does not yet fix. I'd
appreciate help in straightening this mess out.

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

name-rev: Fix non-shortest descriptionJohannes Schindelin Mon, 27 Aug 2007 11:37:33 +0000 (12:37 +0100)

name-rev: Fix non-shortest description

Uwe Kleine-König noticed that under certain circumstances, name-rev
picked a non-optimal tag. Jeff King analyzed that name-rev only
takes into account the number of merge traversals, and then the
_last_ number in the description.

As an easy way to fix it, use a weighting factor for merge traversals:
A merge traversal is now made 65535 times more expensive than a
first-parent traversal.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Describe two-dot and three-dot notation for diff endpoints.Mike Hommey Tue, 28 Aug 2007 05:05:19 +0000 (22:05 -0700)

Describe two-dot and three-dot notation for diff endpoints.

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

git-tag(1): Remove duplicate textJari Aalto Mon, 27 Aug 2007 05:54:32 +0000 (08:54 +0300)

git-tag(1): Remove duplicate text

Options -d, -l, -v have already been explained in OPTIONS below.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Lift any characters restriction on searched... Petr Baudis Sat, 25 Aug 2007 22:18:47 +0000 (00:18 +0200)

gitweb: Lift any characters restriction on searched strings

Everything is already fully quoted along the way so I believe this to be
unnecessary at this point. It would pose trouble for regexp searches.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

RelNotes draft for 1.5.3 update.Junio C Hamano Mon, 27 Aug 2007 00:36:10 +0000 (17:36 -0700)

RelNotes draft for 1.5.3 update.

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

Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano Mon, 27 Aug 2007 00:29:26 +0000 (17:29 -0700)

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
git-gui: Correct 'git gui blame' in a subdirectory
git-gui: Do not offer to stage three-way diff hunks into the index
git-gui: Refactor diff pane popup support for future improvements
git-gui: Fix "unoptimized loading" to not cause git-gui to crash
git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
git-gui: Allow git-merge to use branch names in conflict markers
git-gui: Fix window manager problems on ion3

When nothing to git-commit, honor the git-status color... Brian Hetro Sun, 26 Aug 2007 18:35:26 +0000 (14:35 -0400)

When nothing to git-commit, honor the git-status color setting.

Instead of disabling color all of the time during a git-commit, allow
the user's config preference in the situation where there is nothing
to commit. In this situation, the status is printed to the terminal
and not sent to COMMIT_EDITMSG, so honoring the status color setting
is expected.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

gitweb: Fix searchbox positioningPetr Baudis Sun, 26 Aug 2007 19:31:32 +0000 (21:31 +0200)

gitweb: Fix searchbox positioning

Currently, searchbox is CSS'd to have position: absolute, which has the
unfortunate consequence that if the viewport is too small and can't fit
into the page width together with the navbar, it gets overlapped and part
of the navbar gets obscured. This makes searchbox float: right instead,
thus the navbar simply gets wrapped.

Discovered and fix pointed out by Michael Olson <mwolson@gnu.org>.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'master' of git://linux-nfs.org/~bfields/gitJunio C Hamano Sun, 26 Aug 2007 20:18:12 +0000 (13:18 -0700)

Merge branch 'master' of git://linux-nfs.org/~bfields/git

* 'master' of git://linux-nfs.org/~bfields/git:
Documentation/user-manual.txt: fix a few omissions of gitlink commands.
user-manual: fix incorrect header level
user-manual: use pithier example commit
user-manual: introduce the word "commit" earlier
user-manual: minor editing for conciseness
user-manual: edit "ignoring files" for conciseness
Documentation/user-manual.txt: fix a few omissions of gitlink commands.

Merge branch 'maint'J. Bruce Fields Sun, 26 Aug 2007 14:36:38 +0000 (10:36 -0400)

Merge branch 'maint'

Conflicts:

Documentation/user-manual.txt

Documentation/user-manual.txt: fix a few omissions... David Kastrup Wed, 8 Aug 2007 15:34:28 +0000 (17:34 +0200)

Documentation/user-manual.txt: fix a few omissions of gitlink commands.

Signed-off-by: David Kastrup <dak@gnu.org>

user-manual: fix incorrect header levelJ. Bruce Fields Mon, 20 Aug 2007 15:12:09 +0000 (11:12 -0400)

user-manual: fix incorrect header level

This section is a subsection of the "Examples" section.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: use pithier example commitJ. Bruce Fields Sun, 19 Aug 2007 15:14:21 +0000 (11:14 -0400)

user-manual: use pithier example commit

Actually, we should have a competition for the favorite example commit.
Criteria:

- length: one-line changes with one-line comments preferred,
and no long lines
- significance/memorability
- comic value

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: introduce the word "commit" earlierJ. Bruce Fields Sun, 19 Aug 2007 02:16:24 +0000 (22:16 -0400)

user-manual: introduce the word "commit" earlier

Use the word "commit" as a synonym for "version" from the start.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: minor editing for concisenessJ. Bruce Fields Wed, 6 Jun 2007 22:41:43 +0000 (18:41 -0400)

user-manual: minor editing for conciseness

Just cutting out a few unnecessary words.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

user-manual: edit "ignoring files" for concisenessJ. Bruce Fields Fri, 25 May 2007 00:28:14 +0000 (20:28 -0400)

user-manual: edit "ignoring files" for conciseness

The immediate motivation for writing this section was to explain the
various places ignore patterns could be used. However, I still think
.gitignore is the case most people will want to learn about first. It
also makes it a bit more concrete to introduce ignore patterns in the
context of .gitignore first. And the existance of gitignore(5) relieves
the pressure to explain it all here.

So, stick to the .gitignore example, with only a brief mention of the
others, explain the syntax only by example, and leave the rest to
gitignore(5).

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Cc: Johan Herland <johan@herland.net>

Documentation/user-manual.txt: fix a few omissions... David Kastrup Wed, 8 Aug 2007 15:34:28 +0000 (17:34 +0200)

Documentation/user-manual.txt: fix a few omissions of gitlink commands.

Signed-off-by: David Kastrup <dak@gnu.org>

Make usage documentation for git-add consistent.Brian Hetro Sun, 26 Aug 2007 03:20:06 +0000 (23:20 -0400)

Make usage documentation for git-add consistent.

The usage string for the executable was missing --refresh. In
addition, the documentation referred to "file", but the usage string
referred to "filepattern". Updated the documentation to
"filepattern", as git-add does handle patterns.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Make usage documentation for git-am consistent.Brian Hetro Sun, 26 Aug 2007 03:19:38 +0000 (23:19 -0400)

Make usage documentation for git-am consistent.

The usage information in git-am.sh now matches that of the
documentation.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Don't segfault if we failed to inflate a packed deltaShawn O. Pearce Sat, 25 Aug 2007 07:26:04 +0000 (03:26 -0400)

Don't segfault if we failed to inflate a packed delta

Under some types of packfile corruption the zlib stream holding the
data for a delta within a packfile may fail to inflate, due to say
a CRC failure within the compressed data itself. When this occurs
the unpack_compressed_entry function will return NULL as a signal to
the caller that the data is not available. Unfortunately we then
tried to use that NULL as though it referenced a memory location
where a delta was stored and tried to apply it to the delta base.
Loading a byte from the NULL address typically causes a SIGSEGV.

cate on #git noticed this failure in `git fsck --full` where the
call to verify_pack() first noticed that the packfile was corrupt
by finding that the packfile's SHA-1 did not match the raw data of
the file. After finding this fsck went ahead and tried to verify
every object within the packfile, even though the packfile was
already known to be bad. If we are going to shovel bad data at
the delta unpacking code, we better handle it correctly.

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

pack-objects: check return value from read_sha1_file()Junio C Hamano Sat, 25 Aug 2007 08:26:47 +0000 (01:26 -0700)

pack-objects: check return value from read_sha1_file()

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

blame: check return value from read_sha1_file()Junio C Hamano Sat, 25 Aug 2007 08:26:20 +0000 (01:26 -0700)

blame: check return value from read_sha1_file()

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

git-gui: Correct 'git gui blame' in a subdirectory gitgui-0.8.2Shawn O. Pearce Sat, 25 Aug 2007 03:15:50 +0000 (23:15 -0400)

git-gui: Correct 'git gui blame' in a subdirectory

David Kastrup pointed out that the following sequence was not
working as we had intended:

$ cd lib
$ git gui blame console.tcl
fatal: cannot stat path lib/console.tcl: No such file or directory

The problem here was we disabled the chdir to the root of the
working tree when we are running with a "bare allowed" feature
such as blame or browser, but we still kept the prefix we found via
`git rev-parse --show-prefix`. This caused us to try and look for
the file "console.tcl" within the subdirectory but also include
the subdirectory's own path from the root of the working tree.
This is unlikely to succeed, unless the user just happened to have
a "lib/lib/console.tcl" file in the repository, in which case we
would produce the wrong result.

In the case of a bare repository we shouldn't get back a value from
`rev-parse --show-prefix`, so really $_prefix should only be set
to the non-empty string if we are in a working tree and we are in a
subdirectory of that working tree. If this is true we really want
to always be at the top level of the working tree, as all paths are
accessed as though they were relative to the top of the working tree.
Converting $_prefix to a ../ sequence is a fairly simple approach
to moving up the requisite levels.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-p4: Fix warnings about non-existant refs/remotes... Simon Hausmann Fri, 24 Aug 2007 15:46:16 +0000 (17:46 +0200)

git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.

Don't create the p4/HEAD symbolic ref if p4/master doesn't exist yet.

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

git-p4: Make 'git-p4 branches' work after an initial... Simon Hausmann Fri, 24 Aug 2007 15:44:16 +0000 (17:44 +0200)

git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.

After a clone with "git clone" of a repository the p4 branches are only in remotes/origin/p4/* and not in remotes/p4/*.
Separate the code for detection and creation out of the P4Sync command class into standalone methods and use them
from the P4Branches command.

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

Documentation: Correct various misspellings and typos.Brian Hetro Fri, 24 Aug 2007 00:44:13 +0000 (20:44 -0400)

Documentation: Correct various misspellings and typos.

Fix minor typos throughout the documentation.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: For consistency, use CVS instead of... Brian Hetro Fri, 24 Aug 2007 00:40:08 +0000 (20:40 -0400)

Documentation: For consistency, use CVS instead of cvs.

When not referring to the cvs command, CVS makes more sense.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix racy-git handling in git-write-tree.Linus Torvalds Thu, 23 Aug 2007 17:18:54 +0000 (10:18 -0700)

Fix racy-git handling in git-write-tree.

After git-write-tree finishes computing the tree, it updates the
index so that later operations can take advantage of fully
populated cache tree.

However, anybody writing the index file has to mark the entries
that are racily clean. For each entry whose cached lstat(3)
data in the index exactly matches what is obtained from the
filesystem, if the timestamp on the index file was the same or
older than the modification timestamp of the file, the blob
contents and the work tree file, after convert_to_git(), need to
be compared, and if they are different, its index entry needs to
be marked not to match the lstat(3) data from the filesystem.

In order for this to work, convert_to_git() needs to work
correctly, which in turn means you need to read the config file
to get the settings of core.crlf and friends.

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

rebase -i: fix squashing corner caseJohannes Schindelin Thu, 23 Aug 2007 08:55:41 +0000 (09:55 +0100)

rebase -i: fix squashing corner case

When squashing, rebase -i did not prevent fast forwards. This could
happen when picking some other commit than the first one, and then
squashing the first commit. So do not allow fast forwards when
squashing.

Noticed by Johannes Sixt.

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

Install man3 manpages to $PREFIX/share/man/man3 even... martin f. krafft Mon, 20 Aug 2007 07:23:15 +0000 (09:23 +0200)

Install man3 manpages to $PREFIX/share/man/man3 even for site installs

MakeMaker supports three installation modes: perl, site, and vendor. The first
and third install manpages to $PREFIX/share/man, only site installs to
$PREFIX/man. For consistency with the rest of git, which does not make the
distinction and writes all manpages to $PREFIX/share/man, this change makes
sure that perl does too, even when it's installed in site mode.

Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn init/clone --stdlayout option to default-init... martin f. krafft Sat, 14 Jul 2007 09:25:28 +0000 (11:25 +0200)

git-svn init/clone --stdlayout option to default-init trunk/tags/branches

The --stdlayout option to git-svn init/clone initialises the default
Subversion values of trunk,tags,branches: -T trunk -b branches -t tags.
If any of the -T/-t/-b options are given in addition, they are given
preference.

[ew: fixed whitespace and added "-s" shortcut]

Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff-delta.c: Fix broken skip calculation.David Kastrup Thu, 23 Aug 2007 05:51:45 +0000 (07:51 +0200)

diff-delta.c: Fix broken skip calculation.

A particularly bad case was HASH_LIMIT <= hash_count[i] < 2*HASH_LIMIT:
in that case, only a single hash survived. For larger cases,
2*HASH_LIMIT was the actual limiting value after pruning.

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

git-gui: Do not offer to stage three-way diff hunks... Shawn O. Pearce Thu, 23 Aug 2007 06:44:13 +0000 (02:44 -0400)

git-gui: Do not offer to stage three-way diff hunks into the index

git-apply does not accept a patch that was generated as a three-way
combined diff format such as we see during merge conflicts. If we
get such a diff in our diff viewer and try to send it to git-apply
it just errors out and the user is left confused wondering why they
cannot stage that hunk.

Instead of feeding a known to be unacceptable hunk to git-apply we
now just disable the stage/unstage context menu option if the hunk
came from a three way diff. The user may still be confused about
why they cannot work with a combined diff, but at least they are
only confused as to why git-gui is not offering them the action.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano Thu, 23 Aug 2007 06:42:56 +0000 (23:42 -0700)

Merge branch 'master' of git://repo.or.cz/git/fastimport

* 'master' of git://repo.or.cz/git/fastimport:
Teach bash about git-submodule and its subcommands
Teach bash to complete ref arguments to git-describe
Update bash completion with new 1.5.3 command line options

git-svn: dcommit prints out the URL to be committed toEric Wong Thu, 23 Aug 2007 05:14:31 +0000 (22:14 -0700)

git-svn: dcommit prints out the URL to be committed to

This will print out the URL that dcommit will operate on.
If used with --dry-run this will print out the URL without
making changes to the repository.

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

git-gui: Refactor diff pane popup support for future... Shawn O. Pearce Thu, 23 Aug 2007 06:39:45 +0000 (02:39 -0400)

git-gui: Refactor diff pane popup support for future improvements

The current popup_diff_menu procedure is somewhat messy as it has a
few duplications of the same logic in each of the different legs of
the routine. We can simplify these by setting a few state variables
in the different legs.

No functional change, just a cleanup to make it easier to implement
future functional changes within this block.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Teach bash about git-submodule and its subcommandsShawn O. Pearce Thu, 23 Aug 2007 05:50:49 +0000 (01:50 -0400)

Teach bash about git-submodule and its subcommands

The git-submodule command is new in 1.5.3 and contains a number
of useful subcommands for working on submodules. We usually try
to offer the subcommands of a git command in the bash completion,
so here they are for git-submodule.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Teach bash to complete ref arguments to git-describeShawn O. Pearce Thu, 23 Aug 2007 05:42:11 +0000 (01:42 -0400)

Teach bash to complete ref arguments to git-describe

I'm often finding that I need to run git-describe on very long
remote tracking branch names, to find out what tagged revision
the remote tracking branch is now at (or not at). Typing out
the ref names is painful, so bash completion on them is a very
useful feature.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Update bash completion with new 1.5.3 command line... Shawn O. Pearce Thu, 23 Aug 2007 05:39:22 +0000 (01:39 -0400)

Update bash completion with new 1.5.3 command line options

A number of commands have learned new tricks as part of git 1.5.3.
If these are long options (--foo) we tend to support them in the
bash completion, as it makes the user's task of using the option
slightly easier.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-svn: update documentation with CAVEATS sectionEric Wong Thu, 16 Aug 2007 08:56:45 +0000 (01:56 -0700)

git-svn: update documentation with CAVEATS section

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

Reset terminal attributes when terminating git send... Sean Estabrooks Fri, 17 Aug 2007 21:38:25 +0000 (17:38 -0400)

Reset terminal attributes when terminating git send-email

If you break out of the prompts presented to you by git send-email
your terminal can be left in an inconsistent state. Here we trap
the interrupt signal and reset the terminal before exiting.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Document -u option in git-svnimport man pageStefan Sperling Tue, 21 Aug 2007 17:15:09 +0000 (19:15 +0200)

Document -u option in git-svnimport man page

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

Fix breakage in git-rev-list.txtQuy Tonthat Wed, 22 Aug 2007 08:18:03 +0000 (18:18 +1000)

Fix breakage in git-rev-list.txt

Also fix some innocent missing of quotes.

Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git.el: Avoid a lisp error when there's no current... Alexandre Julliard Wed, 22 Aug 2007 10:21:38 +0000 (12:21 +0200)

git.el: Avoid a lisp error when there's no current branch (detached HEAD).

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fix git-remote for ActiveState PerlAlex Riesen Wed, 22 Aug 2007 16:13:07 +0000 (18:13 +0200)

Fix git-remote for ActiveState Perl

For reason unknown a package in ActiveState Perl 5.8.7 must implement
READLINE method differently for scalar and array context. The code
tested to work for more sane and recent version of perl (5.8.8 shipped
with Ubuntu), so maybe it was always a requirement.

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

Documentation: update tar.umask defaultRené Scharfe Tue, 21 Aug 2007 18:01:16 +0000 (20:01 +0200)

Documentation: update tar.umask default

As noted by Mike Hommey, the documentation for the config setting tar.umask
is not up-to-date. Commit f08b3b0e2e9ad87767d80ff03b013c686e08ba4b changed
the default from 0 to 2; this patch finally documents it.

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

Suggest unsetting core.bare when using new-workdir... Shawn O. Pearce Wed, 22 Aug 2007 05:33:49 +0000 (01:33 -0400)

Suggest unsetting core.bare when using new-workdir on a bare repository

If core.bare is set to true in the config file of a repository that
the user is trying to create a working directory from we should
abort and suggest to the user that they remove the option first.

If we leave the core.bare=true setting in the config file then
working tree operations will get confused when they attempt to
execute in the new workdir, as it shares its config file with the
bare repository. The working tree operations will assume that the
workdir is bare and abort, which is not what the user wants.

If we changed core.bare to be false then working tree operations
will function in the workdir but other operations may fail in the
bare repository, as it claims to not be bare.

If we remove core.bare from the config then Git can fallback on
the legacy guessing behavior. This allows operations in the bare
repository to work as though it were bare, while operations in the
workdirs to act as though they are not bare.

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

Fix new-workdir (again) to work on bare repositoriesShawn O. Pearce Wed, 22 Aug 2007 01:50:12 +0000 (21:50 -0400)

Fix new-workdir (again) to work on bare repositories

My day-job workflow involves using multiple workdirs attached to a
bunch of bare repositories. Such repositories are stored inside of
a directory called "foo.git", which means `git rev-parse --git-dir`
will return "." and not ".git". Under such conditions new-workdir
was getting confused about where the Git repository it was supplied
is actually located.

If we get "." for the result of --git-dir query it means we should
use the user supplied path as-is, and not attempt to perform any
magic on it, as the path is directly to the repository.

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

git-gui: Fix "unoptimized loading" to not cause git... Shawn O. Pearce Wed, 22 Aug 2007 06:41:00 +0000 (02:41 -0400)

git-gui: Fix "unoptimized loading" to not cause git-gui to crash

If the tclsh command was not available to us at the time we were
"built" our lib/tclIndex just lists all of our library files and
we source all of them at once during startup, rather than trying
to lazily load only the procedures we need. This is a problem as
some of our library code now depends upon the git-version proc,
and that proc is not defined until after the library was fully
loaded.

I'm moving the library loading until after we have determined the
version of git we are talking to, as this ensures that the required
git-reversion procedure is defined before any library code can be
loaded. Since error_popup is defined in the library we instead use
tk_messageBox directly for errors found during the version detection.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui: Paper bag fix "Stage Hunk For Commit" in diff... Shawn O. Pearce Tue, 21 Aug 2007 06:22:53 +0000 (02:22 -0400)

git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu

In a13ee29b975d3a9a012983309e842d942b2bbd44 I totally broke the
"Stage Hunk For Commit" feature by making this menu item always
appear in a disabled state, so it was never invokable. A "teaser
feature", just sitting there taunting the poor user who has become
used to having it available.

The issue caused by a13ee was I added a test to look at the data
in $file_states, but I didn't do that test correctly as it was
always looking at a procedure local $file_states array, which is
not defined, so the test was always true and we always disabled
the menu entry.

Instead we only want to disable the menu entry if the current file
we are looking at has no file state information (git-gui is just a
very confused little process) or it is an untracked file (and we
cannot stage individual hunks).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

GIT 1.5.3-rc6 v1.5.3-rc6Junio C Hamano Tue, 21 Aug 2007 05:48:29 +0000 (22:48 -0700)

GIT 1.5.3-rc6

Hopefully last rc of 1.5.3 cycle, except a few documentation and
message wording changes, and git-gui 0.8.2.

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

Merge branch 'master' of git://git./gitk/gitkJunio C Hamano Tue, 21 Aug 2007 05:45:03 +0000 (22:45 -0700)

Merge branch 'master' of git://git./gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Add a window to list branches, tags and other references
[PATCH] gitk: Handle 'copy from' and 'copy to' in diff headers.
gitk: Fix bug in fix for warning when removing a branch

Avoid using va_copy in fast-import: it seems to be... Alex Riesen Tue, 21 Aug 2007 03:38:14 +0000 (23:38 -0400)

Avoid using va_copy in fast-import: it seems to be unportable.

[sp: minor change to use fputs, thus reducing the patch size]

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

git clone: do not issue warning while cloning locally... Junio C Hamano Mon, 20 Aug 2007 22:35:15 +0000 (15:35 -0700)

git clone: do not issue warning while cloning locally across filesystems

Unless the user explicitly asked hardlinking with the '-l'
option, we should not say "oops we cannot hardlink as you asked
so we are copying".

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

gitk: Add a window to list branches, tags and other... Paul Mackerras Mon, 20 Aug 2007 09:36:20 +0000 (19:36 +1000)

gitk: Add a window to list branches, tags and other references

This adds an entry to the File menu labelled "List references" which
pops up a window showing a sorted list of branches, tags, and other
references, with a little icon beside each to indicate what sort it
is. The list only shows refs that point to a commit that is included
in the graph, and if you click on a ref, the corresponding commit
is selected in the main window. The list of refs gets updated
dynamically.

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

Fix misspelling of 'suppress' in docsDave Watson Mon, 20 Aug 2007 02:27:52 +0000 (22:27 -0400)

Fix misspelling of 'suppress' in docs

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

git-gui: Allow git-merge to use branch names in conflic... Shawn O. Pearce Mon, 20 Aug 2007 06:17:05 +0000 (02:17 -0400)

git-gui: Allow git-merge to use branch names in conflict markers

Earlier when I rewrote the merge implementation for git-gui I broke
it such that the conflict markers for the "theirs" side of the hunk
was using a full SHA-1 ID in hex, rather than the name of the branch
the user had merged. This was because I got paranoid and passed off
the full SHA-1 to git-merge, instead of giving it the reference name
the user saw in the merge dialog.

I'd still like to resolve the SHA-1 upfront in git-gui and always use
that value throughout the merge, but I can't do that until we have a
full implementation of git-merge written in Tcl. Until then its more
important that the conflict markers be useful to the end-user, so we
need to pass off the ref name and not the SHA-1 ID.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Document what the stage numbers in the :$n:path syntax... Steven Grimm Mon, 20 Aug 2007 03:36:38 +0000 (11:36 +0800)

Document what the stage numbers in the :$n:path syntax mean.

The git-rev-parse manpage talks about the :$n:path notation (buried deep in
a list of other syntax) but it just says $n is a "stage number" -- someone
who is not familiar with the internals of git's merge implementation is
never going to be able to figure out that "1", "2", and "3" means.

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

Don't allow combination of -g and --reverse as it doesn... Shawn O. Pearce Mon, 20 Aug 2007 02:33:43 +0000 (22:33 -0400)

Don't allow combination of -g and --reverse as it doesn't work

The --walk-reflogs logic and the --reverse logic are completely
incompatible with one another. Attempting to use both at the same
time leads to confusing results that sometimes violates the user's
formatting options or ignores the user's request to see the reflog
message and timestamp.

Unfortunately the implementation of both of these features is glued
onto the side of the revision walking machinary in such a way that
they are probably not going to be easy to make them compatible with
each other. Rather than offering the user confusing results we are
better off bailing out with an error message until such a time as
the implementations can be refactored to be compatible.

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

git-gui: Fix window manager problems on ion3Shawn O. Pearce Mon, 20 Aug 2007 04:53:04 +0000 (00:53 -0400)

git-gui: Fix window manager problems on ion3

cehteh on #git noticed that secondary windows such as console
windows from push/fetch/merge or the blame browser failed on ion
when we tried to open them a second time.

The issue turned out to be the fact that on ion [winfo ismapped .]
returns false if . is not visible right now because it has been
obscured by another window in the same panel. So we need to keep
track of whether or not the root window has been displayed for this
application, and once it has been we cannot ever assume that ismapped
is going to return true.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Add the word reflog to Documentation/config.txt:core... Lukas Sandström Sun, 19 Aug 2007 21:38:57 +0000 (23:38 +0200)

Add the word reflog to Documentation/config.txt:core.logAllRefUpdates

This makes it easier to find out how to enable the reflog
for a bare repository by searching the documentation for
"reflog".

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add and document a global --no-pager option for git.Matthieu Moy Sun, 19 Aug 2007 17:24:36 +0000 (19:24 +0200)

Add and document a global --no-pager option for git.

To keep the change small, this is done by setting GIT_PAGER to "cat".

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Take binary diffs into account for "git rebase"Linus Torvalds Sat, 18 Aug 2007 22:52:55 +0000 (15:52 -0700)

Take binary diffs into account for "git rebase"

We used to not generate a patch ID for binary diffs, but that means that
some commits may be skipped as being identical to already-applied diffs
when doing a rebase.

So just delete the code that skips the binary diff. At the very least,
we'd want the filenames to be part of the patch ID, but we might also want
to generate some hash for the binary diff itself too.

This fixes an issue noticed by Torgil Svensson.

Tested-by: Torgil Svensson <torgil.svensson@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>