git.git
19 years agoFix compilation warnings.
Junio C Hamano [Tue, 30 Aug 2005 04:17:21 +0000 (21:17 -0700)]
Fix compilation warnings.

... found by compiling them with gcc 2.95.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Update Thunderbird specific hints.
A Large Angry SCM [Tue, 30 Aug 2005 02:34:07 +0000 (22:34 -0400)]
[PATCH] Update Thunderbird specific hints.

Setting the wraplength to zero keeps the bird from trimming WS.

Signed-off-by: <gitzilla@gmail.com>
(cherry picked from 1d535d525d6a0ddddc3755065d721278bc5f0aff commit)

19 years ago[PATCH] Documentation for git-request-pull-script.
A Large Angry SCM [Tue, 30 Aug 2005 02:33:14 +0000 (22:33 -0400)]
[PATCH] Documentation for git-request-pull-script.

Copy & paste source comments into documentation.

Signed-off-by: <gitzilla@gmail.com>
(cherry picked from 10dce95490cb02f66b3a08984ccdee0a92b48236 commit)

19 years ago[PATCH] Documentation for git-clone-dumb-http.
A Large Angry SCM [Tue, 30 Aug 2005 02:32:04 +0000 (22:32 -0400)]
[PATCH] Documentation for git-clone-dumb-http.

Copy & paste source comments into documentation.

Signed-off-by: <gitzilla@gmail.com>
(cherry picked from f79528e5d05a64d68b8e09a18521950775e99ec1 commit)

19 years ago[PATCH] Documentation for git-daemon.
A Large Angry SCM [Tue, 30 Aug 2005 02:31:22 +0000 (22:31 -0400)]
[PATCH] Documentation for git-daemon.

Copy & paste source comments into documentation.

Signed-off-by: <gitzilla@gmail.com>
(cherry picked from 5d0a4efeff62cfa363437f91308453b5b9fd8cf5 commit)

19 years agoAccumulated documentation updates.
Junio C Hamano [Tue, 30 Aug 2005 00:21:06 +0000 (17:21 -0700)]
Accumulated documentation updates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-repack-script: Add option to repack all objects.
Junio C Hamano [Mon, 29 Aug 2005 17:29:53 +0000 (10:29 -0700)]
git-repack-script: Add option to repack all objects.

This originally came from Frank Sorenson, but with a bit of rework to
allow future enhancements without changing the external interface for
pack pruning part.

With the '-a' option, all objects in the current repository are packed
into a single pack.  When the '-d' option is given at the same time,
existing packs that were made redundant by this round of repacking are
deleted.

Since we currently have only two repacking strategies, one with '-a'
(everything into one) and the other without '-a' (incrementally pack
only the unpacked ones), the '-d' option is meaningful only when used
with '-a'; it removes the packs existed before we did the "everything
into one" repacking.  At least for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Frank Sorenson <frank@tuxrocks.com>
(cherry picked from bfed505327e31221d8de796b3af880bad696b149 commit)

19 years agoUpdates: show-branch
Junio C Hamano [Tue, 30 Aug 2005 00:19:47 +0000 (17:19 -0700)]
Updates: show-branch

Earlier show-branch gave names only to commits reachable via first
parent ancestry chain.  Change the naming code to name everybody.

The original idea was to stop at the first merge point in the
topological order, and --more=<n> to show commits until we show <n>
more extra merge points.  However depending on the order of how we
discover the commits, it additionally showed parents of the <n>th
merge points, which was unnecessary.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agomailinfo and applymbox updates
Junio C Hamano [Sun, 28 Aug 2005 19:33:16 +0000 (12:33 -0700)]
mailinfo and applymbox updates

This attempts to minimally cope with a subset of MIME "features" often
seen in patches sent to our mailing lists.  Namely:

 - People's name spelled in characters outside ASCII (both on From:
   header and the signed-off-by line).

 - Content-transfer-encoding using quoted-printable (both in
   multipart and non-multipart messages).

These MIME features are detected and decoded by "git mailinfo".

Optionally, with the '-u' flag, the output to .info and .msg is
transliterated from its original chaset to utf-8.  This is to
encourage people to use utf8 in their commit messages for
interoperability.

Applymbox accepts additional flag '-u' which is passed to mailinfo.

Signed-off-by: Junio C Hamano / 濱野 純 <junkio@cox.net>
19 years agoDocument "git cherry-pick" and "git revert"
Junio C Hamano [Sun, 28 Aug 2005 10:01:09 +0000 (03:01 -0700)]
Document "git cherry-pick" and "git revert"

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove git-apply-patch-script.
Junio C Hamano [Sat, 27 Aug 2005 00:27:07 +0000 (17:27 -0700)]
Remove git-apply-patch-script.

Now the rebase is rewritten to use git cherry-pick, there is no user
for that ancient script.  I've checked Cogito and StGIT to make sure
they do not use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRedo "revert" using three-way merge machinery.
Junio C Hamano [Sun, 28 Aug 2005 06:53:27 +0000 (23:53 -0700)]
Redo "revert" using three-way merge machinery.

The reverse patch application using "git apply" sometimes is too
rigid.  Since the user would get used to resolving conflicting merges
by hand during the normal merge experience, using the same machinery
would be more helpful rather than just giving up.

Cherry-picking and reverting are essentially the same operation.
You pick one commit, and apply the difference that commit introduces
to its own commit ancestry chain to the current tree.  Revert applies
the diff in reverse while cherry-pick applies it forward.  They share
the same logic, just different messages and merge direction.

Rewrite "git rebase" using "git cherry-pick".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRevert "Replace zero-length array decls with []."
Junio C Hamano [Mon, 29 Aug 2005 19:41:03 +0000 (12:41 -0700)]
Revert "Replace zero-length array decls with []."

This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit, whose
change breaks gcc-2.95.

Not that I ignore portability to compilers that are properly C99, but
keeping compilation with GCC working is more important, at least for
now.  We would probably end up declaring with "name[1]" and teach the
allocator to subtract one if we really aimed for portability, but that
is left for later rounds.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
Junio C Hamano [Mon, 29 Aug 2005 06:02:01 +0000 (23:02 -0700)]
Merge refs/heads/portable from cs.berkeley.edu/~ejr/gits/git.git

19 years ago[PATCH] tutorial note about git branch
Amos Waterland [Mon, 29 Aug 2005 04:05:36 +0000 (23:05 -0500)]
[PATCH] tutorial note about git branch

Explain that an asterisk will be displayed in front of the current
branch when you run `git branch' to see which are available.

Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate SubmittingPatches.
Junio C Hamano [Mon, 29 Aug 2005 00:54:18 +0000 (17:54 -0700)]
Update SubmittingPatches.

- It does not matter how I read git list.  What matters is that
  I do not necessarily read everything on it.

- Talk a bit about how to use applymbox to check one's own
  patches.

- Talk a bit about PGP signed patches.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add footnote about Thunderbird about trimming trailing WS.
A Large Angry SCM [Sun, 28 Aug 2005 21:17:15 +0000 (17:17 -0400)]
[PATCH] Add footnote about Thunderbird about trimming trailing WS.

Add footnote about Thunderbird about trimming trailing WS.

Signed-off-by: <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add some documentation.
A Large Angry SCM [Sun, 28 Aug 2005 21:16:01 +0000 (17:16 -0400)]
[PATCH] Add some documentation.

Add some documentation.

Text taken from the the commit messages and the command sources.

Signed-off-by: <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] New git-apply test cases for scanning forwards and backwards.
Robert Fitzsimons [Sun, 28 Aug 2005 15:25:10 +0000 (15:25 +0000)]
[PATCH] New git-apply test cases for scanning forwards and backwards.

Added a new test case for the scanning forwards and backwards for the
correct location to apply a patch fragment.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] New git-apply test cases for patches with mulitple fragments.
Robert Fitzsimons [Sun, 28 Aug 2005 15:25:06 +0000 (15:25 +0000)]
[PATCH] New git-apply test cases for patches with mulitple fragments.

Added a test case for patches with multiple fragments.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix git patch header processing in git-apply.
Robert Fitzsimons [Sun, 28 Aug 2005 15:24:27 +0000 (15:24 +0000)]
[PATCH] Fix git patch header processing in git-apply.

Stop processing and return NULL if we encounter a '\n' character
before we have two matching names in the git header.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTeach git-status-script about git-ls-files --others
Junio C Hamano [Fri, 26 Aug 2005 09:12:50 +0000 (02:12 -0700)]
Teach git-status-script about git-ls-files --others

When there is non-empty $GIT_DIR/info/exclude file, use it along
with .gitignore per-directory exclude pattern files (which was
a convention agreed on the list while ago and is compatible with
Cogito) to generate a list of ignored files as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit)

19 years agoShow the branch name more prominently in "git status".
Junio C Hamano [Fri, 26 Aug 2005 23:53:26 +0000 (16:53 -0700)]
Show the branch name more prominently in "git status".

When not working on "master" branch, remind the user at the beginning
of the status message, not at the end.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoBarf nicely when "git push" is run without parameter.
Junio C Hamano [Fri, 26 Aug 2005 17:37:17 +0000 (10:37 -0700)]
Barf nicely when "git push" is run without parameter.

Saying "internal error" makes it look like my fault ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Make .git directory validation code test HEAD
Linus Torvalds [Sat, 27 Aug 2005 20:54:42 +0000 (13:54 -0700)]
[PATCH] Make .git directory validation code test HEAD

Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.

We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.

Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.

This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate SubmittingPatches to add MUA specific notes.
Junio C Hamano [Sat, 27 Aug 2005 06:53:07 +0000 (23:53 -0700)]
Update SubmittingPatches to add MUA specific notes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAccept -m and friends for initial commits and merge commits.
Junio C Hamano [Fri, 26 Aug 2005 01:57:35 +0000 (18:57 -0700)]
Accept -m and friends for initial commits and merge commits.

Yes it was irritating not to be able to do so.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd how-to on using update-hook.
Junio C Hamano [Sat, 27 Aug 2005 05:35:45 +0000 (22:35 -0700)]
Add how-to on using update-hook.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix pulling into the same branch.
Junio C Hamano [Fri, 26 Aug 2005 01:15:32 +0000 (18:15 -0700)]
Fix pulling into the same branch.

When the "git pull" command updates the branch head you are
currently on, before doing anything else, first update your
index file and the working tree contents to that of the new
branch head.  Otherwise, the later resolving steps would think
your index file is attempting to revert the change between the
original head commit and the updated head commit.

It uses two-tree fast-forward form of "read-tree -m -u" to
prevent losing whatever local changes you may have in the
working tree to do this update.  I think this would at least
make things safer (a lot safer), and prevent mistakes.

Also "git fetch" command is forbidden from fetching and fast
forwarding the current branch head unless --update-head-ok flag
is given.  "git pull" passes the flag when it internally calls
"git fetch".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoEnable git-send-email-script on Debian.
Junio C Hamano [Thu, 25 Aug 2005 23:31:43 +0000 (16:31 -0700)]
Enable git-send-email-script on Debian.

You can define WITH_SEND_EMAIL to include the send-email command as
part of the installation.  Since Debian, unlike RPM/Fedora, has the
two necessary Perl modules available as part of the mainline
distribution, there is no reason for us to shy away from shipping
send-email.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate the main documentation index.
Junio C Hamano [Sat, 27 Aug 2005 04:33:46 +0000 (21:33 -0700)]
Update the main documentation index.

Gitzilla updated bunch of undocumented command pages, so move the
entries in the main documentation index around to put them in proper
category.  Ordering within category will be fixed later.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Subject: [PATCH] Add some documentation.
A Large Angry SCM [Sat, 27 Aug 2005 01:18:48 +0000 (18:18 -0700)]
[PATCH] Subject: [PATCH] Add some documentation.

Add some documentation.

Text taken from the the commit messages and the command sources.

19 years ago[PATCH] git bugfixes and cleanups, mainly Debian things
Tommi Virtanen [Fri, 26 Aug 2005 11:00:04 +0000 (14:00 +0300)]
[PATCH] git bugfixes and cleanups, mainly Debian things

Point Debian doc-base at the right files. Clean up.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git bugfixes and cleanups, mainly Debian things
Tommi Virtanen [Fri, 26 Aug 2005 11:00:05 +0000 (14:00 +0300)]
[PATCH] git bugfixes and cleanups, mainly Debian things

Ignore generated files.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git bugfixes and cleanups, mainly Debian things
Tommi Virtanen [Fri, 26 Aug 2005 11:00:04 +0000 (14:00 +0300)]
[PATCH] git bugfixes and cleanups, mainly Debian things

Generate docs for gitk. Install them in the right deb package.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git bugfixes and cleanups, mainly Debian things
Tommi Virtanen [Fri, 26 Aug 2005 11:00:04 +0000 (14:00 +0300)]
[PATCH] git bugfixes and cleanups, mainly Debian things

Make the git deb conflict with cogito versions prior to 0.13, as those
versions used to contain git. Suggest cogito.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git bugfixes and cleanups, mainly Debian things
Tommi Virtanen [Fri, 26 Aug 2005 11:00:03 +0000 (14:00 +0300)]
[PATCH] git bugfixes and cleanups, mainly Debian things

Fix syntax error in debian Build-Depends-Indep, dpkg-checkbuilddeps used
to give false ok results.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd Abstract: support for howto index generator.
Junio C Hamano [Fri, 26 Aug 2005 19:35:51 +0000 (12:35 -0700)]
Add Abstract: support for howto index generator.

Maybe it's time for me to really learn asciidoc.  Also I should do Perl ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] More missing terms in glossary.txt
Johannes Schindelin [Thu, 25 Aug 2005 14:24:13 +0000 (16:24 +0200)]
[PATCH] More missing terms in glossary.txt

Describe a DAG and octopus, and change wording of tree object.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] update howto/using-topic-branches.txt
tony.luck@intel.com [Fri, 26 Aug 2005 05:11:08 +0000 (22:11 -0700)]
[PATCH] update howto/using-topic-branches.txt

Various updates and cleanups for my howto on using branches in GIT
as a Linux subsystem maintainer.  Three categories of changes:

1) Updates for new features in GIT 0.99.5
2) Changes to use "git fetch" rather than "git pull" to update
   local linus branch.
3) Cleanups suggested by Len Brown

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDon't forget to build the howto-index file.
Junio C Hamano [Thu, 25 Aug 2005 07:36:41 +0000 (00:36 -0700)]
Don't forget to build the howto-index file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoLink howto documents from the main git.txt documentation.
Junio C Hamano [Thu, 25 Aug 2005 07:28:18 +0000 (00:28 -0700)]
Link howto documents from the main git.txt documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSort branch names snarfed from refs/ hierarchy.
Junio C Hamano [Thu, 25 Aug 2005 06:26:20 +0000 (23:26 -0700)]
Sort branch names snarfed from refs/ hierarchy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix fetching of tags.
Junio C Hamano [Thu, 25 Aug 2005 05:46:07 +0000 (22:46 -0700)]
Fix fetching of tags.

"git fetch tag <tag>" stored a tag after dereferencing.  Bad.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from . v0.99.5
Junio C Hamano [Thu, 25 Aug 2005 01:54:24 +0000 (18:54 -0700)]
Merge refs/heads/master from .

19 years ago[PATCH] Fix silly pathspec bug in git-ls-files
Linus Torvalds [Wed, 24 Aug 2005 00:14:13 +0000 (17:14 -0700)]
[PATCH] Fix silly pathspec bug in git-ls-files

The "verify_pathspec()" function doesn't test for ending NUL character in
the pathspec, causing some really funky and unexpected behaviour. It just
happened to work in the cases I had tested.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix git-checkout-script exit status
tony.luck@intel.com [Tue, 23 Aug 2005 21:03:14 +0000 (14:03 -0700)]
[PATCH] Fix git-checkout-script exit status

Sometimes the git-read-tree in git-checkout-script fails for me.
Make sure that the failed status is passed up to caller.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Thu, 25 Aug 2005 00:50:26 +0000 (17:50 -0700)]
Merge refs/heads/master from .

19 years agoFix markup minimally to get man pages built.
Junio C Hamano [Thu, 25 Aug 2005 00:50:05 +0000 (17:50 -0700)]
Fix markup minimally to get man pages built.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Wed, 24 Aug 2005 23:56:48 +0000 (16:56 -0700)]
Merge refs/heads/master from .

19 years agoUpdate tutorial to describe shared repository style a bit more.
Junio C Hamano [Wed, 24 Aug 2005 23:46:11 +0000 (16:46 -0700)]
Update tutorial to describe shared repository style a bit more.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDocumentation: multi-head fetch.
Junio C Hamano [Wed, 24 Aug 2005 23:23:08 +0000 (16:23 -0700)]
Documentation: multi-head fetch.

Add documentation related to multi-head work, including $GIT_DIR/remotes/
changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSupport +<src>:<dst> format in push as well.
Junio C Hamano [Wed, 24 Aug 2005 07:40:14 +0000 (00:40 -0700)]
Support +<src>:<dst> format in push as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Allow "+remote:local" refspec to cause --force when fetching.
Junio C Hamano [Tue, 23 Aug 2005 05:52:43 +0000 (22:52 -0700)]
[PATCH] Allow "+remote:local" refspec to cause --force when fetching.

With this we could say:

    Pull: master:ko-master +pu:ko-pu

to mean "fast forward ko-master with master, overwrite ko-pu with pu",
and the latter one does not require the remote "pu" to be descendant
of local "ko-pu".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Use git-octopus when pulling more than one heads.
Junio C Hamano [Tue, 23 Aug 2005 04:57:59 +0000 (21:57 -0700)]
[PATCH] Use git-octopus when pulling more than one heads.

With this, you can finally say "git pull jgarzik sil24 pdc2027x".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] "git fetch --force".
Junio C Hamano [Tue, 23 Aug 2005 04:28:33 +0000 (21:28 -0700)]
[PATCH] "git fetch --force".

Just like "git push" can forcibly update a ref to a value that is not
a fast-forward, teach "git fetch" to do so as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Use .git/remote/origin, not .git/branches/origin.
Junio C Hamano [Sat, 20 Aug 2005 10:05:42 +0000 (03:05 -0700)]
[PATCH] Use .git/remote/origin, not .git/branches/origin.

Now multi-head fetch is complete, let's migrate the
default configuration for new repositories created with
the "git clone" command.

The original $GIT_DIR/branches is not deprecated yet, but create
remotes directory by default from the templates as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Make "git pull" and "git fetch" default to origin
Junio C Hamano [Sat, 20 Aug 2005 10:00:03 +0000 (03:00 -0700)]
[PATCH] Make "git pull" and "git fetch" default to origin

Amos Waterland sent in a patch for the pre-multi-head aware
version of "git pull" to do this, but the code changed quite a
bit since then.  If there is no argument given to pull from, and
if "origin" makes sense, default to fetch/pull from "origin"
instead of barfing.

[jc: besides, the patch by Amos broke the non-default case where
explicit refspecs are specified, and did not make sure we know
what "origin" means before defaulting to it.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Infamous 'octopus merge'
Junio C Hamano [Sat, 20 Aug 2005 09:58:42 +0000 (02:58 -0700)]
[PATCH] Infamous 'octopus merge'

This script uses the list of heads and their origin multi-head "git
fetch" left in the $GIT_DIR/FETCH_HEAD file, and makes an octopus
merge on top of the current HEAD using them.

The implementation tries to be strict for the sake of safety.  It
insists that your working tree is clean (no local changes) and matches
the HEAD, and when any of the merged heads does not automerge, the
whole process is aborted and tries to rewind your working tree is to
the original state.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Retire git-parse-remote.
Junio C Hamano [Sat, 20 Aug 2005 09:57:26 +0000 (02:57 -0700)]
[PATCH] Retire git-parse-remote.

Update git-pull to match updated git-fetch and allow pull to
fetch from multiple remote references.  There is no support for
resolving more than two heads, which will be done with "git
octopus".

Update "git ls-remote" to use git-parse-remote-script.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Multi-head fetch.
Junio C Hamano [Sat, 20 Aug 2005 09:54:34 +0000 (02:54 -0700)]
[PATCH] Multi-head fetch.

Traditionally, fetch takes these forms:

    $ git fetch <remote>
    $ git fetch <remote> <head>
    $ git fetch <remote> tag <tag>

This patch updates it to take

    $ git fetch <remote> <refspec>...

where:

    - A <refspec> of form "<src>:<dst>" is to fetch the objects
      needed for the remote ref that matches <src>, and if <dst>
      is not empty, store it as a local <dst>.

    - "tag" followed by <next> is just an old way of saying
      "refs/tags/<next>:refs/tags/<next>"; this mimics the
      current behaviour of the third form above and means "fetch
      that tag and store it under the same name".

    - A single token <refspec> without colon is a shorthand for
      "<refspec>:"  That is, "fetch that ref but do not store
      anywhere".

    - when there is no <refspec> specified

      - if <remote> is the name of a file under $GIT_DIR/remotes/
(i.e. a new-style shorthand), then it is the same as giving
the <refspec>s listed on Pull: line in that file.

      - if <remote> is the name of a file under $GIT_DIR/branches/
(i.e. an old-style shorthand, without trailing path), then it
is the same as giving a single <refspec>
"<remote-name>:refs/heads/<remote>" on the command line, where
<remote-name> is the remote branch name (defaults to HEAD, but
can be overridden by .git/branches/<remote> file having the
URL fragment notation).  That is, "fetch that branch head and
store it in refs/heads/<remote>".

      - otherwise, it is the same as giving a single <refspec>
        that is "HEAD:".

The SHA1 object names of fetched refs are stored in FETCH_HEAD,
one name per line, with a comment to describe where it came from.
This is later used by "git resolve" and "git octopus".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Start adding the $GIT_DIR/remotes/ support.
Junio C Hamano [Sat, 20 Aug 2005 09:52:24 +0000 (02:52 -0700)]
[PATCH] Start adding the $GIT_DIR/remotes/ support.

All the necessary parsing code is in git-parse-remote-script;
update git-push-script to use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix "prefix" mixup in git-rev-list
Pavel Roskin [Wed, 24 Aug 2005 21:58:42 +0000 (17:58 -0400)]
[PATCH] Fix "prefix" mixup in git-rev-list

Recent changes in git have broken cg-log.  git-rev-list no longer
prints "commit" in front of commit hashes.  It turn out a local
"prefix" variable in main() shadows a file-scoped "prefix" variable.

The patch removed the local "prefix" variable since its value is never
used (in the intended way, that is).  The call to
setup_git_directory() is kept since it has useful side effects.

The file-scoped "prefix" variable is renamed to "commit_prefix" just
in case someone reintroduces "prefix" to hold the return value of
setup_git_directory().

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAudit rev-parse users again.
Junio C Hamano [Wed, 24 Aug 2005 21:31:36 +0000 (14:31 -0700)]
Audit rev-parse users again.

Some callers to rev-parse were using the output selection flags
inconsistently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRationalize output selection in rev-parse.
Junio C Hamano [Wed, 24 Aug 2005 21:30:04 +0000 (14:30 -0700)]
Rationalize output selection in rev-parse.

Earlier rounds broke 'whatchanged -p'.  In attempting to fix this,
make two axis of output selection in rev-parse orthogonal:

  --revs-only tells it not to output things that are not revisions nor
flags that rev-list would take.
  --no-revs tells it not to output things that are revisions or
flags that rev-list would take.
  --flags tells it not to output parameters that do not start with
a '-'.
  --no-flags tells it not to output parameters that starts with a '-'.

So for example 'rev-parse --no-revs -p arch/i386' would yield '-p arch/i386',
while 'rev-parse --no-revs --flags -p archi/i386' would give just '-p'.

Also the meaning of --verify has been made stronger.  It now rejects
anything but a single valid rev argument.  Earlier it passed some flags
through without complaining.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoGenerate pack info file after repack.
Junio C Hamano [Wed, 24 Aug 2005 17:40:58 +0000 (10:40 -0700)]
Generate pack info file after repack.

Pulling from a packed repository over dumb transport without the
server info file fails, so run update-server-info automatically
after a repack by default.  This can be disabled with the '-n'
flag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Wed, 24 Aug 2005 04:30:42 +0000 (21:30 -0700)]
Merge refs/heads/master from .

19 years agoLink the tutorial from the main document.
Junio C Hamano [Wed, 24 Aug 2005 04:18:49 +0000 (21:18 -0700)]
Link the tutorial from the main document.

And lead the reader to it at the beginning of the manual.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTry to find the optimum merge base while resolving.
Junio C Hamano [Wed, 24 Aug 2005 04:08:59 +0000 (21:08 -0700)]
Try to find the optimum merge base while resolving.

The merge-base command acquires a new option, '--all', that causes it
to output all the common ancestor candidates.  The "git resolve"
command then uses it to pick the optimum merge base by picking the one
that results in the smallest number of nontrivial merges.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoReplace C99 array initializers with code.
Jason Riedy [Tue, 23 Aug 2005 20:52:52 +0000 (13:52 -0700)]
Replace C99 array initializers with code.

The only use of C99 array initializers is in ident.c, so
just replace it with initializing code.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
19 years agoReplace unsetenv() and setenv() with older putenv().
Jason Riedy [Tue, 23 Aug 2005 20:52:01 +0000 (13:52 -0700)]
Replace unsetenv() and setenv() with older putenv().

Solaris 8 doesn't have the newer unsetenv() and setenv()
functions, so replace them with putenv().  The one use of
unsetenv() in fsck-cache.c now sets GIT_ALTERNATE_OBJECT_
DIRECTORIES to the empty string.  Every place that var
is used, NULLs are also replaced with empty strings, so
it's ok.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
19 years agoInclude sys/time.h in daemon.c.
Jason Riedy [Tue, 23 Aug 2005 20:34:44 +0000 (13:34 -0700)]
Include sys/time.h in daemon.c.

Some systems and feature levels want sys/time.h for fd_set
functionality.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
19 years agoFix ?: statements.
Jason Riedy [Tue, 23 Aug 2005 20:34:07 +0000 (13:34 -0700)]
Fix ?: statements.

Omitting the first branch in ?: is a GNU extension.  Cute,
but not supported by other compilers.  Replaced mostly
by explicit tests.  Calls to getenv() simply are repeated
on non-GNU compilers.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
19 years agoReplace zero-length array decls with [].
Jason Riedy [Tue, 23 Aug 2005 20:31:09 +0000 (13:31 -0700)]
Replace zero-length array decls with [].

C99 denotes variable-sized members with [], not [0].

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Tue, 23 Aug 2005 22:32:17 +0000 (15:32 -0700)]
Merge refs/heads/master from .

19 years agoTutorial updates.
Junio C Hamano [Tue, 23 Aug 2005 22:28:34 +0000 (15:28 -0700)]
Tutorial updates.

 - Use "working tree", "object name", "repository" as the canonical
   term consistenly.

 - Start formatting tutorial with asciidoc.

 - Mention shared repository style of cooperation.

 - Update with some usability enhancements recently made, such as
   the "-m" flag to the "git commit" command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate git-diff-script.
Junio C Hamano [Tue, 23 Aug 2005 20:18:00 +0000 (13:18 -0700)]
Update git-diff-script.

This uses the fixed rev-parse to allow passing diff options to the
underlying diff command.  For example:

    $ git diff -r HEAD

shows the output in raw-diff format, and

    $ git diff -p -R HEAD | git apply

generates a patch to go back from your working tree to HEAD commit
(i.e. an expensive way to say "git checkout -f HEAD").

At the same time, it accidentally removes the use of shell arrays.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMake "git-rev-list" work within subdirectories
Linus Torvalds [Tue, 23 Aug 2005 17:31:41 +0000 (10:31 -0700)]
Make "git-rev-list" work within subdirectories

This trivial patch makes "git-rev-list" able to handle not being in
the top-level directory.  This magically also makes "git-whatchanged"
do the right thing.

Trivial scripting fix to make sure that "git log" also works.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix git-rev-parse --default and --flags handling
Linus Torvalds [Tue, 23 Aug 2005 17:47:54 +0000 (10:47 -0700)]
[PATCH] Fix git-rev-parse --default and --flags handling

This makes the argument to --default and any --flags arguments should up
correctly, and makes "--" together with --flags act sanely.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd placeholders for missing documents.
Junio C Hamano [Tue, 23 Aug 2005 08:49:47 +0000 (01:49 -0700)]
Add placeholders for missing documents.

The text does not say anything interesting, but at least the
author list should reflect something close to reality.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Tue, 23 Aug 2005 07:07:17 +0000 (00:07 -0700)]
Merge refs/heads/master from .

19 years agoIntroduce "reset type" flag to "git reset"
Junio C Hamano [Tue, 23 Aug 2005 00:55:26 +0000 (17:55 -0700)]
Introduce "reset type" flag to "git reset"

I have been feeling that the current behaviour of "git reset" is
not quite optimal, but so far could not express exactly what I
felt was wrong with it.  This patch clarifies it.

There are at least two situations you may want to "reset" your
working tree.

1. You made a mess in your working tree.  You want to switch
   back to a known good state and start over.  This mess may be
   a result of your own editing, a merge that had too many
   conflicting changes that you do not feel like to resolve by
   hand at this moment, or a botched application of a patch you
   received from somewhere.

   In this case, you would want to have "git reset HEAD" reset
   the index file to the tree read from the HEAD commit and the
   files in the working tree to match index (i.e. "git status"
   should say "Nothing to commit", without any "unrecorded
   changes").

   The current behaviour leaves the files in the working tree
   intact, which requires you to run "git checkout -f".  Also
   you need to remember "rm -f" any files that the botched patch
   may have left in the working tree if the purpose of this
   "reset" is to attempt to apply it again; most likely the
   patch would fail if such a file is left behind.

2. You have discovered that commits you made earlier need to be
   reorganized.  The simplest example is to undo the last
   commit, re-edit some files, and redo the commit.  Another
   simple eample is to undo the last two commits, and commit the
   changes in those two commits as a single commit.

   In this case, you would want to have "git reset HEAD^" reset
   the $GIT_DIR/HEAD to the commit object name of the parent
   commit of the current commit (i.e. rewinding one commit),
   leave the index file and the files in the working tree in a
   state where you can easily make a commit that records a tree
   that resembles what you have in the current index file and
   the working tree.

   The current behaviour is almost OK for this purpose, except
   that you need to find which files you need to manually run
   "git add" yourself.  They are files that are in the original
   HEAD commit and not in the commit you are resetting to.

The default without the type flag is to do "--mixed", which is
the current behaviour.

    $ git reset [ --hard | --soft | --mixed ] [ <commit-ish> ]

A hard reset would be used for 1 and works in this way:

    (1) remember the set of paths that appear in the current
        index file (which may even have unmerged entries) and
the current $GIT_DIR/HEAD commit.

    (2) "read-tree --reset" the specified <commit-ish> (default
        to HEAD), followed by "checkout-cache -f -u -a".

    (3) remove any files that appear in (1) but not in
        <commit-ish> from the working tree.

    (4) backup $GIT_DIR/HEAD to $GIT_DIR/ORIG_HEAD and update
        $GIT_DIR/HEAD with the specified <commit-ish>.

    (5) remove leftover $GIT_DIR/MERGE_HEAD

A soft reset would be used for 2 and works in this way:

    (1) Make sure that the index file is merged and we do not
        have MERGE_HEAD; otherwise it does not make sense to do
        soft reset.

    (2) backup $GIT_DIR/HEAD to $GIT_DIR/ORIG_HEAD and update
        $GIT_DIR/HEAD with the specified <commit-ish>.

Note that with the current behaviour, "git diff" is the way to
see what could be committed immediately after "git reset".  With
the "soft reset" described here you would need to say "git diff
HEAD" to find that out.

I am not sure what mixed reset (the current behaviour) is good
for.  If nobody comes up with a good use case it may not be a
bad idea to remove it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoClean-up output from "git show-branch" and document it.
Junio C Hamano [Tue, 23 Aug 2005 06:16:46 +0000 (23:16 -0700)]
Clean-up output from  "git show-branch" and document it.

When showing only one branch a lot of default output becomes redundant,
so clean it up a bit, and document what is shown.  Retire the earlier
implementation "git-show-branches-script".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add 'git show-branch'.
Junio C Hamano [Sun, 21 Aug 2005 09:51:10 +0000 (02:51 -0700)]
[PATCH] Add 'git show-branch'.

The 'git show-branches' command turns out to be reasonably useful,
but painfully slow.  So rewrite it in C, using ideas from merge-base
while enhancing it a bit more.

 - Unlike show-branches, it can take --heads (show me all my
   heads), --tags (show me all my tags), or --all (both).

 - It can take --more=<number> to show beyond the merge-base.

 - It shows the short name for each commit in the extended SHA1
   syntax.

 - It can find merge-base for more than two heads.

Examples:

    $ git show-branch --more=6 HEAD

    is almost the same as "git log --pretty=oneline --max-count=6".

    $ git show-branch --merge-base master mhf misc

    finds the merge base of the three given heads.

    $ git show-branch master mhf misc

    shows logs from the top of these three branch heads, up to their
    common ancestor commit is shown.

    $ git show-branch --all --more=10

    is poor-man's gitk, showing all the tags and heads, and
    going back 10 commits beyond the merge base of those refs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Add a new extended SHA1 syntax <name>~<num>
Junio C Hamano [Sun, 21 Aug 2005 09:43:54 +0000 (02:43 -0700)]
[PATCH] Add a new extended SHA1 syntax <name>~<num>

The new notation is a short-hand for <name> followed by <num>
caret ('^') characters.  E.g. "master~4" is the fourth
generation ancestor of the current "master" branch head,
following the first parents; same as "master^^^^" but a bit
more readable.

This will be used in the updated "git show-branch" command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix "git-diff-script A B"
Junio C Hamano [Sun, 21 Aug 2005 20:56:52 +0000 (13:56 -0700)]
Fix "git-diff-script A B"

When "git-diff-script A..B" notation was introduced, it ended up breaking
the traditional two revisions notation.

[jc: there are other issues with the current "git diff" I would like to
 address, but they would be left to later rounds.  For example, -M and -p flags
 should not be hardcoded default, and it shouldn't be too hard to rewrite
 the script without using shell arrays.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] git-ls-files: generalized pathspecs
Linus Torvalds [Mon, 22 Aug 2005 00:27:50 +0000 (17:27 -0700)]
[PATCH] git-ls-files: generalized pathspecs

This generalizes the git "glob" string to be a lot more like the
git-diff-* pathspecs (but there are still differences: the diff family
doesn't do any globbing, and because the diff family always generates the
full native pathname, it doesn't have the issue with "..").

It does three things:

 - it allows multiple matching strings, ie you can do things like

git-ls-files arch/i386/ include/asm-i386/ | xargs grep pattern

 - the "matching" criteria is a combination of "exact path component
   match" (the same as the git-diff-* family), and "fnmatch()". However,
   you should be careful with the confusion between the git-ls-files
   internal globbing and the standard shell globbing, ie

git-ls-files fs/*.c

   does globbing in the shell, and does something totally different from

git-ls-files 'fs/*.c'

   which does the globbing inside git-ls-files.

   The latter has _one_ pathspec with a wildcard, and will match any .c
   file anywhere under the fs/ directory, while the former has been
   expanded by the shell into having _lots_ of pathspec entries, all of
   which are just in the top-level fs/ subdirectory. They will happily
   be matched exactly, but we will thus miss all the subdirectories under
   fs/.

   As a result, the first one will (on the current kernel) match 55 files,
   while the second one will match 664 files!

 - it uses the generic path prefixing, so that ".." and friends at the
   beginning of the path spec work automatically

   NOTE! When generating relative pathname output (the default), a
   pathspec that causes the base to be outside the current working
   directory will be rejected with an error message like:

fatal: git-ls-files: cannot generate relative filenames containing '..'

   because we do not actually generate ".." in the output. However, the
   ".." format works fine for the --full-name case:

cd arch/i386/kernel
git-ls-files --full-name ../mm/

   results in

arch/i386/mm/Makefile
arch/i386/mm/boot_ioremap.c
arch/i386/mm/discontig.c
arch/i386/mm/extable.c
arch/i386/mm/fault.c
arch/i386/mm/highmem.c
arch/i386/mm/hugetlbpage.c
arch/i386/mm/init.c
arch/i386/mm/ioremap.c
arch/i386/mm/mmap.c
arch/i386/mm/pageattr.c
arch/i386/mm/pgtable.c

   Perhaps more commonly, the generic path prefixing means that "." and
   "./" automatically get simplified and work properly.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Sun, 21 Aug 2005 20:59:38 +0000 (13:59 -0700)]
Merge refs/heads/master from .

19 years ago[PATCH] Make "git-ls-files" work in subdirectories
Linus Torvalds [Sun, 21 Aug 2005 19:55:33 +0000 (12:55 -0700)]
[PATCH] Make "git-ls-files" work in subdirectories

This makes git-ls-files work inside a relative directory, and also adds
some rudimentary filename globbing support. For example, in the kernel you
can now do

cd arch/i386
git-ls-files

and it will show all files under that subdirectory (and it will have
removed the "arch/i386/" prefix unless you give it the "--full-name"
option, so that you can feed the result to "xargs grep" or similar).

The filename globbing is kind of strange: it does _not_ follow normal
globbing rules, although it does look "almost" like a normal file glob
(and it uses the POSIX.2 "fnmatch()" function).

The glob pattern (there can be only one) is always split into a "directory
part" and a "glob part", where the directory part is defined as any full
directory path without any '*' or '?' characters. The "glob" part is
whatever is left over.

For example, when doing

git-ls-files 'arch/i386/p*/*.c'

the "directory part" is is "arch/i386/", and the "glob part" is "p*/*.c".
The directory part will be added to the prefix, and handled efficiently
(ie we will not be searching outside of that subdirectory), while the glob
part (if anything is left over) will be used to trigger "fnmatch()"
matches.

This is efficient and very useful, but can result in somewhat
non-intuitive behaviour.

For example:

git-ls-files 'arch/i386/*.[ch]'

will find all .c and .h files under arch/i386/, _including_ things in
lower subdirectories (ie it will match "arch/i386/kernel/process.c",
because "kernel/process.c" will match the "*.c" specifier).

Also, while

git-ls-files arch/i386/

will show all files under that subdirectory, doing the same without the
final slash would try to show the file "i386" under the "arch/"
subdirectory, and since there is no such file (even if there is such a
_directory_) it will not match anything at all.

These semantics may not seem intuitive, but they are actually very
practical. In particular, it makes it very simple to do

git-ls-files fs/*.c | xargs grep some_pattern

and it does what you want.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge refs/heads/master from .
Junio C Hamano [Sun, 21 Aug 2005 11:38:33 +0000 (04:38 -0700)]
Merge refs/heads/master from .

19 years ago[PATCH] sha1_name: do not accept .git/refs/snap/.
Junio C Hamano [Sun, 21 Aug 2005 09:43:08 +0000 (02:43 -0700)]
[PATCH] sha1_name: do not accept .git/refs/snap/.

I think Linus did a cut & paste from an early JIT code while
developing the current extended SHA1 notation, and left it there as a
courtesy, but the directory does not deserve to be treated any more
specially than, say, .git/refs/bisect.

If the subdirectories under .git/refs proliferate, we may want to
switch to scanning that hierarchy at runtime, instead of the current
hard-coded set, although I think that would be overkill.

Signed-off-by: Junio C Hamano <junkio@cox.net>
From nobody Mon Sep 17 00:00:00 2001
Subject: [PATCH] Add a new extended SHA1 syntax <name>:<num>
From: Junio C Hamano <junkio@cox.net>
Date: 1124617434 -0700

The new notation is a short-hand for <name> followed by <num>
caret ('^') characters.  E.g. "master:4" is the fourth
generation ancestor of the current "master" branch head,
following the first parents; same as "master^^^^" but a bit more
readable.

This will be used in the updated "git show-branch" command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

 sha1_name.c |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

d5098ce769da46df6d45dc8f41b06dd758fdaea7
diff --git a/sha1_name.c b/sha1_name.c
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -191,9 +191,29 @@ static int get_parent(const char *name,
  return -1;
 }

+static int get_nth_ancestor(const char *name, int len,
+     unsigned char *result, int generation)
+{
+ unsigned char sha1[20];
+ int ret = get_sha1_1(name, len, sha1);
+ if (ret)
+ return ret;
+
+ while (generation--) {
+ struct commit *commit = lookup_commit_reference(sha1);
+
+ if (!commit || parse_commit(commit) || !commit->parents)
+ return -1;
+ memcpy(sha1, commit->parents->item->object.sha1, 20);
+ }
+ memcpy(result, sha1, 20);
+ return 0;
+}
+
 static int get_sha1_1(const char *name, int len, unsigned char *sha1)
 {
  int parent, ret;
+ const char *cp;

  /* foo^[0-9] or foo^ (== foo^1); we do not do more than 9 parents. */
  if (len > 2 && name[len-2] == '^' &&
@@ -210,6 +230,27 @@ static int get_sha1_1(const char *name,
  if (parent >= 0)
  return get_parent(name, len, sha1, parent);

+ /* name:3 is name^^^,
+  * name:12 is name^^^^^^^^^^^^, and
+  * name: is name
+  */
+ parent = 0;
+ for (cp = name + len - 1; name <= cp; cp--) {
+ int ch = *cp;
+ if ('0' <= ch && ch <= '9')
+ continue;
+ if (ch != ':')
+ parent = -1;
+ break;
+ }
+ if (!parent && *cp == ':') {
+ int len1 = cp - name;
+ cp++;
+ while (cp < name + len)
+ parent = parent * 10 + *cp++ - '0';
+ return get_nth_ancestor(name, len1, sha1, parent);
+ }
+
  ret = get_sha1_basic(name, len, sha1);
  if (!ret)
  return 0;

19 years ago[PATCH] possible memory leak in diff.c::diff_free_filepair()
Yasushi SHOJI [Sun, 21 Aug 2005 07:14:16 +0000 (16:14 +0900)]
[PATCH] possible memory leak in diff.c::diff_free_filepair()

Here is a patch to fix the problem in the simplest way.

19 years agoCreate objects/info/ directory in init-db.
Junio C Hamano [Sat, 20 Aug 2005 09:05:31 +0000 (02:05 -0700)]
Create objects/info/ directory in init-db.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Fix git-commit-script to output on stderr when -v fails
Marco Costalba [Sat, 20 Aug 2005 16:02:16 +0000 (18:02 +0200)]
[PATCH] Fix git-commit-script to output on stderr when -v fails

When git-commit-script is called with -v option and
verify test fails result is print on stdout
instead of stderr.

[jc: The original patch from Marco updated git-commit-script that
still had the piece of code in question, which has been moved to
an example hook script on its own, so I transplanted the patch to
that new file instead.]

Signed-off-by: Marco Costalba <mcostalba@yahoo.it>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge with master to pick up commit hook works.
Junio C Hamano [Sat, 20 Aug 2005 08:47:08 +0000 (01:47 -0700)]
Merge with master to pick up commit hook works.

19 years agogit-resolve: dying is good, not showing help is bad.
Junio C Hamano [Sat, 20 Aug 2005 08:21:21 +0000 (01:21 -0700)]
git-resolve: dying is good, not showing help is bad.

Recent change to make sure we get commit, not tag, accidentally
removed its feature of giving a usage help message when it died.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMake sample pre-commit hook output Emacs friendly.
Junio C Hamano [Sat, 20 Aug 2005 08:05:12 +0000 (01:05 -0700)]
Make sample pre-commit hook output Emacs friendly.

Use the common error message format, "filename:lineno: body";
this way, problematic lines can be jumped to from the Emacs
compilation buffer by C-x `.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoCall prune-packed from "git prune" as well.
Junio C Hamano [Sat, 20 Aug 2005 04:38:36 +0000 (21:38 -0700)]
Call prune-packed from "git prune" as well.

Add -n (dryrun) flag to git-prune-packed, and call it from "git prune".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge with master to pick up gitk updates.
Junio C Hamano [Fri, 19 Aug 2005 23:24:29 +0000 (16:24 -0700)]
Merge with master to pick up gitk updates.

19 years agoAdd hooks to tools/git-applypatch.
Junio C Hamano [Fri, 19 Aug 2005 20:53:13 +0000 (13:53 -0700)]
Add hooks to tools/git-applypatch.

This teachs git-applypatch, which is used from git-applymbox, three
hooks, similar to what git-commit-script uses.

Signed-off-by: Junio C Hamano <junkio@cox.net>