git.git
17 years agogit-gc --auto: protect ourselves from accumulated cruft
Junio C Hamano [Mon, 17 Sep 2007 07:44:17 +0000 (00:44 -0700)]
git-gc --auto: protect ourselves from accumulated cruft

Deciding to run "repack -d -l" when there are too many
loose objects would backfire when there are too many loose
objects that are unreachable, because repacking that way would
never improve the situation.  Detect that case by checking the
number of loose objects again after automatic garbage collection
runs, and issue an warning to run "prune" manually.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-gc --auto: add documentation.
Junio C Hamano [Mon, 17 Sep 2007 07:39:52 +0000 (00:39 -0700)]
git-gc --auto: add documentation.

This documents the auto-packing of loose objects performed by
git-gc --auto.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-gc --auto: move threshold check to need_to_gc() function.
Junio C Hamano [Mon, 17 Sep 2007 07:37:06 +0000 (00:37 -0700)]
git-gc --auto: move threshold check to need_to_gc() function.

That is where we decide if we are going to run gc
automatically.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agorepack -A -d: use --keep-unreachable when repacking
Junio C Hamano [Mon, 17 Sep 2007 06:24:07 +0000 (23:24 -0700)]
repack -A -d: use --keep-unreachable when repacking

This is a safer variant of "repack -a -d" that does not drop
unreachable objects that are in packs.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agopack-objects --keep-unreachable
Junio C Hamano [Mon, 17 Sep 2007 06:20:07 +0000 (23:20 -0700)]
pack-objects --keep-unreachable

This new option is meant to be used in conjunction with the
options "git repack -a -d" usually invokes the underlying
pack-objects with.  When this option is given, objects unreachable
from the refs in packs named with --unpacked= option are added
to the resulting pack, in addition to the reachable objects that
are not in packs marked with *.keep files.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoExport matches_pack_name() and fix its return value
Junio C Hamano [Mon, 17 Sep 2007 06:15:19 +0000 (23:15 -0700)]
Export matches_pack_name() and fix its return value

The function sounds boolean; make it behave as one, not "0 for
success, non-zero for failure".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoInvoke "git gc --auto" from commit, merge, am and rebase.
Junio C Hamano [Wed, 5 Sep 2007 21:59:59 +0000 (14:59 -0700)]
Invoke "git gc --auto" from commit, merge, am and rebase.

The point of auto gc is to pack new objects created in loose
format, so a good rule of thumb is where we do update-ref after
creating a new commit.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoImplement git gc --auto
Junio C Hamano [Wed, 5 Sep 2007 20:01:37 +0000 (13:01 -0700)]
Implement git gc --auto

This implements a new option "git gc --auto".  When gc.auto is
set to a positive value, and the object database has accumulated
roughly that many number of loose objects, this runs a
lightweight version of "git gc".  The primary difference from
the full "git gc" is that it does not pass "-a" option to "git
repack", which means we do not try to repack _everything_, but
only repack incrementally.  We still do "git prune-packed".  The
default threshold is arbitrarily set by yours truly to:

 - not trigger it for fully unpacked git v0.99 history;

 - do trigger it for fully unpacked git v1.0.0 history;

 - not trigger it for incremental update to git v1.0.0 starting
   from fully packed git v0.99 history.

This patch does not add invocation of the "auto repacking".  It
is left to key Porcelain commands that could produce tons of
loose objects to add a call to "git gc --auto" after they are
done their work.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'master' of git://repo.or.cz/git/git-p4
Junio C Hamano [Thu, 6 Sep 2007 07:05:49 +0000 (00:05 -0700)]
Merge branch 'master' of git://repo.or.cz/git/git-p4

* 'master' of git://repo.or.cz/git/git-p4:
  git-p4: Added support for automatically importing newly appearing perforce branches.
  git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
  git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
  git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
  git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
  git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
  git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
  git-p4: Always call 'p4 sync ...' before submitting to Perforce.

17 years agoMerge branch 'maint'
Junio C Hamano [Thu, 6 Sep 2007 06:37:02 +0000 (23:37 -0700)]
Merge branch 'maint'

* maint:
  Include a git-push example for creating a remote branch
  Cleanup unnecessary file modifications in t1400-update-ref
  Makefile: Add cache-tree.h to the headers list
  Don't allow contrib/workdir/git-new-workdir to trash existing dirs
  git-apply: do not read past the end of buffer

17 years agoInclude a git-push example for creating a remote branch
Shawn O. Pearce [Thu, 6 Sep 2007 04:44:08 +0000 (00:44 -0400)]
Include a git-push example for creating a remote branch

Many users get confused when `git push origin master:foo` works
when foo already exists on the remote repository but are confused
when foo doesn't exist as a branch and this form does not create
the branch foo.

This new example highlights the trick of including refs/heads/
in front of the desired branch name to create a branch.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoCleanup unnecessary file modifications in t1400-update-ref
Shawn O. Pearce [Thu, 6 Sep 2007 02:15:21 +0000 (22:15 -0400)]
Cleanup unnecessary file modifications in t1400-update-ref

Kristian Høgsberg pointed out that the two file modifications
we were doing during the 'creating initial files' step are not even
used within the test suite.  This was actually confusing as we do
not even need these changes for the tests to pass.  All that really
matters here is the specific commit dates are used so that these
appear in the branch's reflog, and that the dates are different so
that the branch will update when asked and the reflog entry is
also updated.  There is no need for the file modification.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMakefile: Add cache-tree.h to the headers list
Dmitry V. Levin [Wed, 5 Sep 2007 23:22:51 +0000 (03:22 +0400)]
Makefile: Add cache-tree.h to the headers list

The dependency was missing.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoDon't allow contrib/workdir/git-new-workdir to trash existing dirs
Shawn O. Pearce [Thu, 6 Sep 2007 03:33:41 +0000 (23:33 -0400)]
Don't allow contrib/workdir/git-new-workdir to trash existing dirs

Recently I found that doing a sequence like the following:

  git-new-workdir a b
  ...
  git-new-workdir a b

by accident will cause a (and now also b) to have an infinite cycle
in its refs directory.  This is caused by git-new-workdir trying
to create the "refs" symlink over again, only during the second
time it is being created within a's refs directory and is now also
pointing back at a's refs.

This causes confusion in git as suddenly branches are named things
like "refs/refs/refs/refs/refs/refs/refs/heads/foo" instead of the
more commonly accepted "refs/heads/foo".  Plenty of commands start
to see ambiguous ref names and others just take ages to compute.

git-clone has the same safety check, so git-new-workdir should
behave just like it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-apply: do not read past the end of buffer
Junio C Hamano [Thu, 6 Sep 2007 04:58:40 +0000 (21:58 -0700)]
git-apply: do not read past the end of buffer

When the preimage we are patching is shorter than what the patch
text expects, we tried to match the buffer contents at the
"original" line with the fragment in full, without checking we
have enough data to match in the preimage.  This caused the size
of a later memmove() to wrap around and attempt to scribble
almost the entire address space.  Not good.

The code that follows the part this patch touches tries to match
the fragment with line offsets.  Curiously, that code does not
have the problem --- it guards against reading past the end of
the preimage.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'ds/sendmail'
Junio C Hamano [Wed, 5 Sep 2007 22:23:36 +0000 (15:23 -0700)]
Merge branch 'ds/sendmail'

* ds/sendmail:
  send-email: Add support for SSL and SMTP-AUTH

17 years agoFunction for updating refs.
Carlos Rica [Wed, 5 Sep 2007 01:38:24 +0000 (03:38 +0200)]
Function for updating refs.

A function intended to be called from builtins updating refs
by locking them before write, specially those that came from
scripts using "git update-ref".

[jc: with minor fixups]

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-p4: Added support for automatically importing newly appearing perforce branches.
Simon Hausmann [Sun, 26 Aug 2007 15:36:55 +0000 (17:36 +0200)]
git-p4: Added support for automatically importing newly appearing perforce branches.

If a change in a p4 "branch" appears that hasn't seen any previous commit and
that has a known branch mapping we now try to import it properly. First we
find the p4 change of the source branch that the new p4 branch is based on. Then
we using git rev-list --bisect to locate the corresponding git commit to that change.
Finally we import all changes in the new p4 branch up to the current change and resume
with the regular import.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref...
Simon Hausmann [Sun, 26 Aug 2007 14:44:55 +0000 (16:44 +0200)]
git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: Cleanup; moved the code for the initial #head or revision import into a separ...
Simon Hausmann [Sun, 26 Aug 2007 14:07:18 +0000 (16:07 +0200)]
git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: Cleanup; Turn self.revision into a function local variable (it's not used...
Simon Hausmann [Sun, 26 Aug 2007 14:04:34 +0000 (16:04 +0200)]
git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: Cleanup; moved the code to import a list of p4 changes using fast-import...
Simon Hausmann [Sun, 26 Aug 2007 14:00:52 +0000 (16:00 +0200)]
git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list...
Simon Hausmann [Sun, 26 Aug 2007 13:56:36 +0000 (15:56 +0200)]
git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: After submission to p4 always synchronize from p4 again (into refs/remotes...
Simon Hausmann [Wed, 22 Aug 2007 07:07:15 +0000 (09:07 +0200)]
git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.

Signed-off-by: Simon Hausmann <simon@lst.de>
17 years agogit-p4: Always call 'p4 sync ...' before submitting to Perforce.
Simon Hausmann [Tue, 21 Aug 2007 09:53:02 +0000 (11:53 +0200)]
git-p4: Always call 'p4 sync ...' before submitting to Perforce.

Acked-by: Marius Storm-Olsen <marius@trolltech.com>
Acked-by: Thiago Macieira <thiago@kde.org>
17 years agosend-email: Add support for SSL and SMTP-AUTH
Douglas Stockwell [Sun, 2 Sep 2007 18:06:25 +0000 (03:06 +0900)]
send-email: Add support for SSL and SMTP-AUTH

Allows username and password to be given using --smtp-user
and --smtp-pass. SSL use is flagged by --smtp-ssl. These are
backed by corresponding defaults in the git configuration file.

This implements Junio's 'mail identity' suggestion in a slightly
more generalised manner. --identity=$identity, backed by
sendemail.identity indicates that the configuration subsection
[sendemail "$identity"] should take priority over the [sendemail]
section for all configuration values.

Signed-off-by: Douglas Stockwell <doug@11011.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoStart 1.5.4 cycle
Junio C Hamano [Mon, 3 Sep 2007 09:40:06 +0000 (02:40 -0700)]
Start 1.5.4 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoGIT 1.5.3.1: obsolete git-p4 in RPM spec file. v1.5.3.1
Junio C Hamano [Sun, 2 Sep 2007 22:16:44 +0000 (15:16 -0700)]
GIT 1.5.3.1: obsolete git-p4 in RPM spec file.

HPA noticed that yum does not like the newer git RPM set; it turns out
that we do not ship git-p4 anymore but existing installations do not
realize the package is gone if we do not tell anything about it.

David Kastrup suggests using Obsoletes in the spec file of the new
RPM to replace the old package, so here is a try.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoTypofix: 1.5.3 release notes
Junio C Hamano [Sun, 2 Sep 2007 22:03:26 +0000 (15:03 -0700)]
Typofix: 1.5.3 release notes

17 years agoGIT 1.5.3 v1.5.3
Junio C Hamano [Sun, 2 Sep 2007 07:00:00 +0000 (00:00 -0700)]
GIT 1.5.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoMerge branch 'jp/send-email-cc'
Junio C Hamano [Sat, 1 Sep 2007 20:15:27 +0000 (13:15 -0700)]
Merge branch 'jp/send-email-cc'

* jp/send-email-cc:
  git-send-email --cc-cmd

17 years agoMention -m as an abbreviation for --merge
Robin Rosenberg [Sat, 1 Sep 2007 12:11:10 +0000 (14:11 +0200)]
Mention -m as an abbreviation for --merge

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoUpdate my contact address as the maintainer.
Junio C Hamano [Sat, 1 Sep 2007 11:09:51 +0000 (04:09 -0700)]
Update my contact address as the maintainer.

17 years agoDocumentation: minor AsciiDoc mark-up fixes.
Junio C Hamano [Sat, 1 Sep 2007 11:01:54 +0000 (04:01 -0700)]
Documentation: minor AsciiDoc mark-up fixes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoURL: allow port specification in ssh:// URLs
Luben Tuikov [Sat, 1 Sep 2007 09:36:31 +0000 (02:36 -0700)]
URL: allow port specification in ssh:// URLs

Allow port specification in ssh:// URLs in the
usual notation:

ssh://[user@]host.domain[:<port>]/<path>

This allows git to be used over ssh-tunneling
networks.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agoAvoid one-or-more (\+) non BRE in sed scripts.
Junio C Hamano [Sat, 1 Sep 2007 09:17:28 +0000 (02:17 -0700)]
Avoid one-or-more (\+) non BRE in sed scripts.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agorebase -m: Fix incorrect short-logs of already applied commits.
Johannes Sixt [Sat, 1 Sep 2007 07:25:27 +0000 (09:25 +0200)]
rebase -m: Fix incorrect short-logs of already applied commits.

When a topic branch is rebased, some of whose commits are already
cherry-picked upstream:

    o--X--A--B--Y    <- master
     \
      A--B--Z        <- topic

then 'git rebase -m master' would report:

    Already applied: 0001 Y
    Already applied: 0002 Y

With this fix it reports the expected:

    Already applied: 0001 A
    Already applied: 0002 B

As an added bonus, this change also avoids 'echo' of a commit message,
which might contain escapements.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-diff: resurrect the traditional empty "diff --git" behaviour
Junio C Hamano [Fri, 31 Aug 2007 20:13:42 +0000 (13:13 -0700)]
git-diff: resurrect the traditional empty "diff --git" behaviour

The warning message to suggest "Consider running git-status" from
"git-diff" that we experimented with during the 1.5.3 cycle turns
out to be a bad idea.  It robbed cache-dirty information from people
who valued it, while still asking users to run "update-index --refresh".
It was hoped that the new behaviour would at least have some educational
value, but not showing the cache-dirty paths like before meant that the
user would not even know easily which paths were cache-dirty, and it
made the need to refresh the index look like even more unnecessary chore.

This commit reinstates the traditional behaviour, but with a twist.

By default, the empty "diff --git" output is totally squelched out
from "git diff" output.  At the end of the command, it automatically
runs "update-index --refresh" as needed, without even bothering the
user.  In other words, people who do not care about the cache-dirtyness
do not even have to see the warning.

The traditional behaviour to see the stat-dirty output and to bypassing
the overhead of content comparison can be specified by setting the
configuration variable diff.autorefreshindex to false.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-tag: Fix -l option to use better shell style globs.
Carlos Rica [Sat, 1 Sep 2007 05:10:09 +0000 (07:10 +0200)]
git-tag: Fix -l option to use better shell style globs.

This patch removes certain behaviour of "git tag -l foo", currently
listing every tag name having "foo" as a substring.  The same
thing now could be achieved doing "git tag -l '*foo*'".

This feature was added recently when git-tag.sh got the -n option
for showing tag annotations, because that commit also replaced the
old "grep pattern" behaviour with a more preferable "shell pattern"
behaviour (although slightly modified as you can see).
Thus, the following builtin-tag.c implemented it in order to
ensure that tests were passing unchanged with both programs.

Since common "shell patterns" match names with a given substring
_only_ when * is inserted before and after (as in "*substring*"), and
the "plain" behaviour cannot be achieved easily with the current
implementation, this is mostly the right thing to do, in order to
make it more flexible and consistent.

Tests for "git tag" were also changed to reflect this.

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years agogit-svn: fix dcommit clobbering upstream when committing multiple changes
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>
17 years agogit-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>
17 years agofilter-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>
17 years agofilter-branch: provide the convenience functions also for commit filters
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>
17 years agorebase -i: mention the option to split commits in the man page
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>
17 years agofilter-branch: fix remnants of old syntax in documentation
Johannes 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>
17 years agoTeach bash about completing arguments for git-tag
Shawn 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>
17 years agoHopefully the final update to draft release notes for 1.5.3.
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>
17 years agoMake "git-log --" without paths behave the same as "git-log" without --
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>
17 years agogit-init: autodetect core.symlinks
Junio 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>
17 years agoMake git-archimport log entries more consistent
Miles 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>
17 years agofix same sized delta logic
Nicolas 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>
17 years agofilter-branch: make sure orig_namespace ends with a single slash.
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>
17 years agogit-filter-branch: document --original option
Giuseppe 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>
17 years agogit-filter-branch: more detailed USAGE
Giuseppe 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>
17 years agoMakefile: do not allow gnu make to remove test-*.o files
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>
17 years agoTemporary fix for stack smashing in mailinfo
Alex 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>
17 years agoFixing comment in merge strategies
Tom 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>
17 years agols-files --error-unmatch: do not barf if the same pattern is given twice.
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>
17 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
Junio 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

17 years agocompletion: also complete git-log's --left-right and --cherry-pick option
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>
17 years agogitk: Fix bug causing undefined variable error when cherry-picking
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>
17 years agogit-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>
17 years agoGIT 1.5.3-rc7 v1.5.3-rc7
Junio 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>
17 years agogit-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>
17 years agogit.el: Added colors for dark background
David 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>
17 years agoformat-patch documentation: reword to hint "--root <one-commit>" more clearly
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>
17 years agoMerge 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.

17 years agoDocumentation/git-diff: A..B and A...B cannot take tree-ishes
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>
17 years agogit-add: Make the filename globbing note a bit clearer
Petr 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>
17 years agogit-add: Make the "tried to add ignored file" error message less confusing
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>
17 years agogitweb: Fix escaping HTML of project owner in 'projects_list' and
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>
17 years ago"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>
17 years agoPorcelain 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>
17 years agogit-merge: do up-to-date check also for all strategies
Junio 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>
17 years agogit --bare cmd: do not unconditionally nuke GIT_DIR
Junio 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>
17 years agoFix initialization of a bare repository
Junio 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>
17 years agoname-rev: Fix non-shortest description
Johannes 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>
17 years agoDescribe 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>
17 years agogit-tag(1): Remove duplicate text
Jari 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>
17 years agogitweb: Lift any characters restriction on searched strings
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>
17 years agoRelNotes 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>
17 years agoMerge branch 'master' of git://repo.or.cz/git-gui
Junio 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

17 years agoWhen nothing to git-commit, honor the git-status color setting.
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>
17 years agogitweb: Fix searchbox positioning
Petr 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>
17 years agoMerge branch 'master' of git://linux-nfs.org/~bfields/git
Junio 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.

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

Conflicts:

Documentation/user-manual.txt

17 years agoDocumentation/user-manual.txt: fix a few omissions of gitlink commands.
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>
17 years agouser-manual: fix incorrect header level
J. 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>
17 years agouser-manual: use pithier example commit
J. 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>
17 years agouser-manual: introduce the word "commit" earlier
J. 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>
17 years agouser-manual: minor editing for conciseness
J. 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>
17 years agouser-manual: edit "ignoring files" for conciseness
J. 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>
17 years agoDocumentation/user-manual.txt: fix a few omissions of gitlink commands.
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>
17 years agoMake 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>
17 years agoMake 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>
17 years agoDon't segfault if we failed to inflate a packed delta
Shawn 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>
17 years agopack-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>
17 years agoblame: 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>
17 years agogit-gui: Correct 'git gui blame' in a subdirectory gitgui-0.8.2
Shawn 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>
17 years agogit-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git...
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>