git/git.git
15 years agoshow-branch: make the current branch and merge commits stand out.
Junio C Hamano [Wed, 11 Jan 2006 22:02:38 +0000 (14:02 -0800)]
show-branch: make the current branch and merge commits stand out.

This changes the character used to mark the commits that is on the
branch from '+' to '*' for the current branch, to make it stand out.
Also we show '-' for merge commits.

When you have a handful branches with relatively long diversion, it
is easier to see which one is the current branch this way.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: show-branch.
Junio C Hamano [Wed, 11 Jan 2006 08:09:16 +0000 (00:09 -0800)]
Documentation: show-branch.

Describe showbranch.default configuration item and give an example.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-push: avoid falling back on pushing "matching" refs.
Junio C Hamano [Thu, 12 Jan 2006 23:29:12 +0000 (15:29 -0800)]
git-push: avoid falling back on pushing "matching" refs.

The underlying "git send-pack remote.host:path" pushes all the
matching refs that both local and remote have, and "git push"
blindly inherits this property.  Which probably was a mistake.

A typical cloned repository (e.g. a subsystem repository cloned
from Linus repository) has at least two branches, "master" to
keep the subsystem and "origin" that records tip of Linus
"master" when the repository was cloned.  If this is the public
repository for the subsystem, then subsystem developers would
clone it, and then cloned ones have "master" and "origin".  When
developers use this public subsystem repository as a shared
repository, pushing into it via "git push subsys:/path/name"
would try to push the matching refs, "master" and "origin", from
the developers' repositories.  The "origin" in the public shared
repository does not have much relevance, yet pushing into
"origin" would cause "not a fast forward" checks to be
triggered.  Arguably "git push subsys:/path/name master" would
work it around, but having them to say it explicitly to avoid
pushing into "origin" as well is bad.

This commit requires you to give at least one refspec to
git-push.  You could "give" by either:

 (1) Listing the refspec(s) explicitly on the command line.
     E.g. "git push subsys:/path/name master".

 (2) Using --all or --tags on the command line.
     E.g. "git push --tags subsys:/path/name".

 (3) Using a $GIT_DIR/remotes shorthand with 'Push: refspec'
     line in it.

Unlike pull that can happen pretty much promiscuously, people
will push into the same set of a limited number of remote
repositories repeatedly over the life of the project, so it is
reasonable to assume they would want to keep a $GIT_DIR/remotes/
entry for those repositories even only to save typing the URL,
so keeping the default 'Push: refspec' line in such is a
sensible thing to do.

It was suggested to further fall back on pushing the current
branch, but this commit does not implement it.  If developers
adopt topic branch workflow, pushing to public while on a topic
branch by mistake would expose the topic branch to the public
repository.  Not falling back to the current branch prevents
that mistake from happening.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agocheckout: merge local modifications while switching branches.
Junio C Hamano [Thu, 12 Jan 2006 22:04:36 +0000 (14:04 -0800)]
checkout: merge local modifications while switching branches.

 * Instead of going interactive, introduce a command line switch
   '-m' to allow merging changes when normal two-way merge by
   read-tree prevents branch switching.

 * Leave the unmerged stages intact if automerge fails, but
   reset index entries of cleanly merged paths to that of the
   new branch, so that "git diff" (not "git diff HEAD") would
   show the local modifications.

 * Swap the order of trees in read-tree three-way merge used in
   the fallback, so that `git diff` to show the conflicts become
   more natural.

 * Describe the new option and give more examples in the documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agocheckout: automerge local changes while switching branches.
Junio C Hamano [Thu, 12 Jan 2006 07:07:27 +0000 (23:07 -0800)]
checkout: automerge local changes while switching branches.

When switching branches, if the working tree has a local
modification at paths that are different between current and new
branches, we refused the operation saying "cannot merge."  This
attempts to do an automerge for such paths.

This is still experimental.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge fixes up to GIT 1.1.2
Junio C Hamano [Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)]
Merge fixes up to GIT 1.1.2

15 years agoFix the installation location.
Junio C Hamano [Fri, 13 Jan 2006 05:37:17 +0000 (21:37 -0800)]
Fix the installation location.

The earlier change to separate $(gitexecdir) from $(bindir) had
the installation location of the git wrapper and the rest of the
commands the wrong way (right now, both of them point at the
same location so there is no real harm).

Also gitk needs to be installed in $(bindir).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoExec git programs without using PATH.
Michal Ostrowski [Wed, 11 Jan 2006 02:12:17 +0000 (21:12 -0500)]
Exec git programs without using PATH.

The git suite may not be in PATH (and thus programs such as
git-send-pack could not exec git-rev-list).  Thus there is a need for
logic that will locate these programs.  Modifying PATH is not
desirable as it result in behavior differing from the user's
intentions, as we may end up prepending "/usr/bin" to PATH.

- git C programs will use exec*_git_cmd() APIs to exec sub-commands.
- exec*_git_cmd() will execute a git program by searching for it in
  the following directories:
1. --exec-path (as used by "git")
2. The GIT_EXEC_PATH environment variable.
3. $(gitexecdir) as set in Makefile (default value $(bindir)).
- git wrapper will modify PATH as before to enable shell scripts to
  invoke "git-foo" commands.

Ideally, shell scripts should use the git wrapper to become independent
of PATH, and then modifying PATH will not be necessary.

[jc: with minor updates after a brief review.]

Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT 1.1.2 v1.1.2
Junio C Hamano [Sat, 14 Jan 2006 00:47:05 +0000 (16:47 -0800)]
GIT 1.1.2

15 years agoGIT 1.0.10 v1.0.10
Junio C Hamano [Sat, 14 Jan 2006 00:39:17 +0000 (16:39 -0800)]
GIT 1.0.10

15 years agoDocumentation: git-reset - interrupted workflow.
Junio C Hamano [Fri, 13 Jan 2006 21:17:55 +0000 (13:17 -0800)]
Documentation: git-reset - interrupted workflow.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: git-commit -a
Junio C Hamano [Fri, 13 Jan 2006 20:59:21 +0000 (12:59 -0800)]
Documentation: git-commit -a

A bit more elaboration on what "update all paths" means.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agooctopus: allow criss-cross and clarify the message when it rejects
Junio C Hamano [Fri, 13 Jan 2006 09:37:09 +0000 (01:37 -0800)]
octopus: allow criss-cross and clarify the message when it rejects

We rejected multi-base merge situations even though we used the
same underlying multi-base git-read-tree as the resolve strategy
uses.  This was unneeded and did not add much to ensure the
merge to be truly trivial, so remove this restriction and be
more similar to what resolve does.

Also when the merge did not trivially resolve, we rejected
without stating that octopus strategy does not handle the
situation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: clarify fetch parameter descriptions.
J. Bruce Fields [Fri, 13 Jan 2006 03:08:37 +0000 (22:08 -0500)]
Documentation: clarify fetch parameter descriptions.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMakefile: add 'strip' target
Junio C Hamano [Fri, 13 Jan 2006 05:42:25 +0000 (21:42 -0800)]
Makefile: add 'strip' target

This is not invoked by any other target (most notably, "make
install" does not), but is provided as a convenience for people
who are building from the source.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoshow-branch: handle [] globs as well.
Junio C Hamano [Wed, 11 Jan 2006 08:20:25 +0000 (00:20 -0800)]
show-branch: handle [] globs as well.

Earlier only '?' and '*' signalled the command that what the
user has given is a glob pattern.  This prevented us to say:

$ git show-branch 'v0.99.[0-3]'

Now we notice '[' as well, so the above would work.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoname-rev: do not omit leading components of ref name.
Junio C Hamano [Wed, 11 Jan 2006 22:20:09 +0000 (14:20 -0800)]
name-rev: do not omit leading components of ref name.

In a repository with mainto/1.0 (to keep maintaining the 1.0.X
series) and fixo/1.0 (to keep fixes that apply to both 1.0.X
series and upwards) branches, "git-name-rev mainto/1.0" answered
just "1.0" making things ambiguous.  Show refnames unambiguously
like show-branch does.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-describe: default to HEAD
Junio C Hamano [Wed, 11 Jan 2006 21:57:42 +0000 (13:57 -0800)]
git-describe: default to HEAD

This is based on the patch by Andreas Ericsson, but done slightly
differently, preferring to have separate loops -- one for options
and then arguments.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agodescribe: do not silently ignore indescribable commits
Junio C Hamano [Wed, 11 Jan 2006 21:41:25 +0000 (13:41 -0800)]
describe: do not silently ignore indescribable commits

We silently ignored indescribable commits without complaining.
Complain and die instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoupdate-index: work with c-quoted name
Junio C Hamano [Wed, 11 Jan 2006 21:36:45 +0000 (13:36 -0800)]
update-index: work with c-quoted name

update-index --stdin did not work with c-style quoted names even though
update-index --index-info did.  This fixes the inconsistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd git-describe to .gitignore.
Tom Prince [Wed, 11 Jan 2006 06:40:33 +0000 (23:40 -0700)]
Add git-describe to .gitignore.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd --keep option to keep downloaded packs to git-fetch.
Tom Prince [Wed, 11 Jan 2006 01:50:19 +0000 (18:50 -0700)]
Add --keep option to keep downloaded packs to git-fetch.

Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge fixes up to GIT 1.1.1
Junio C Hamano [Wed, 11 Jan 2006 00:29:17 +0000 (16:29 -0800)]
Merge fixes up to GIT 1.1.1

15 years agoGIT 1.0.9 v1.0.9
Junio C Hamano [Wed, 11 Jan 2006 00:20:22 +0000 (16:20 -0800)]
GIT 1.0.9

15 years agoGIT 1.1.1 v1.1.1
Junio C Hamano [Wed, 11 Jan 2006 00:19:11 +0000 (16:19 -0800)]
GIT 1.1.1

15 years agoglossary: explain "master" and "origin"
Johannes Schindelin [Tue, 10 Jan 2006 21:26:46 +0000 (22:26 +0100)]
glossary: explain "master" and "origin"

If you are a long time git user/developer, you forget that to a new git
user, these words have not the same meaning as to you.

[jc: with updates from J. Bruce Fields.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoshow-branch: take default arguments from configuration file.
Junio C Hamano [Mon, 9 Jan 2006 21:29:23 +0000 (13:29 -0800)]
show-branch: take default arguments from configuration file.

This lets showbranch.default multivalued configuration item to
be used as the default set of parameters to git-show-branch when
none is given on the command line.

I keep many topic branches (e.g. zzz/pack, net/misc) and
branches used only as a reference under subdirectories
(e.g. hold/{html,man,todo} track the same from git.git, but
clutters the show-branch output when shown along with the main
development; ko/master tracks what I have pushed out already and
refetched from the kernel.org server), and often run:

$ git show-branch ko/master heads/*

to view only the ko/master head and branches I keep immediately
under $GIT_DIR/refs/heads.  With this change, I can have this in
my $GIT_DIR/config file:

[showbranch]
default = ko/master
default = heads/*

and say

$ git show-branch

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
Junio C Hamano [Mon, 9 Jan 2006 22:25:10 +0000 (14:25 -0800)]
GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.

If we are building from a working tree with local modifications,
mark the version accordingly.

Deliberately uses '-' to prevent RPM from being built from such
a tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFor release tarballs, include the proper version
H. Peter Anvin [Tue, 10 Jan 2006 02:07:01 +0000 (18:07 -0800)]
For release tarballs, include the proper version

When producing a release tarball, include a "version" file, which
GIT-VERSION-GEN can then use to do the right thing when building from a
tarball.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT 1.1.0 v1.1.0
Junio C Hamano [Sun, 8 Jan 2006 22:22:19 +0000 (14:22 -0800)]
GIT 1.1.0

15 years agoAdd a test for rebase when a change was picked upstream
Yann Dirson [Sun, 8 Jan 2006 00:39:48 +0000 (01:39 +0100)]
Add a test for rebase when a change was picked upstream

This test exercises the standard feature that makes rebase useful.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd a minimal test for git-cherry
Yann Dirson [Sun, 8 Jan 2006 00:38:15 +0000 (01:38 +0100)]
Add a minimal test for git-cherry

This test checks that git-cherry finds the expected number of patches
in two simple cases, and then tests the new limit arguments.

[jc: collapsed two patches into one and added sleep to make sure
 the two commits would get different timestamps]

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd an optional limit to git-cherry
Yann Dirson [Sun, 8 Jan 2006 00:40:33 +0000 (01:40 +0100)]
Add an optional limit to git-cherry

This allows to use another commit than the merge base as a limit for
scanning patches.

[jc: part about t3500 test omitted.]

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-daemon --base-path
Petr Baudis [Fri, 23 Dec 2005 01:27:40 +0000 (02:27 +0100)]
git-daemon --base-path

Tommi Virtanen expressed a wish on #git to be able to use short and elegant
git URLs by making git-daemon 'root' in a given directory. This patch
implements this, causing git-daemon to interpret all paths relative to
the given base path if any is given.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agodescribe: allow more than one revs to be named.
Junio C Hamano [Sun, 8 Jan 2006 02:52:42 +0000 (18:52 -0800)]
describe: allow more than one revs to be named.

The main loop was prepared to take more than one revs, but the actual
naming logic wad not (it used pop_most_recent_commit while forgetting
that the commit marks stay after it's done).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files --others --directory: test
Junio C Hamano [Sat, 7 Jan 2006 22:17:58 +0000 (14:17 -0800)]
ls-files --others --directory: test

Add a test to run with --directory option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-status: use ls-files --others --directory for untracked list.
Junio C Hamano [Sat, 7 Jan 2006 22:32:07 +0000 (14:32 -0800)]
git-status: use ls-files --others --directory for untracked list.

This shortens "Untracked files" list by using --directory option
when running ls-files --others.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files --others --directory: give trailing slash
Junio C Hamano [Sat, 7 Jan 2006 22:31:56 +0000 (14:31 -0800)]
ls-files --others --directory: give trailing slash

This adds a trailing slash to directory names in the output
when "--others --directory" option shows only untracked
directories and not their contents, to make them stand out.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files --others --directory: fix a bug with index entry ordering
Junio C Hamano [Sat, 7 Jan 2006 22:32:09 +0000 (14:32 -0800)]
ls-files --others --directory: fix a bug with index entry ordering

When both howto-index.sh and howto/make-dist.txt exist under
Documentation/ directory, dir_exists() mistakenly checked it
without the trailing slash to see if there was something under
Documentation/howto directory, and did not realize there was,
because '-' sorts earlier than '/' and cache_name_pos() finds
howto-index.sh, which is not under howto/ directory.  This
caused --others --directory to show it which was incorrect.

Check the directory name with the trailing slash, because having
an entry that has such as a prefix is what we are looking for.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files -o: optionally skip showing the contents in "untracked" directories
Linus Torvalds [Wed, 4 Jan 2006 21:31:25 +0000 (13:31 -0800)]
ls-files -o: optionally skip showing the contents in "untracked" directories

Darrin Thompson notes that git-ls-files -o reports all the unknown
files it finds in a work area.  Subversion and probably other systems
"simply ignore all the files and directories inside an unknown
directory and just note the directory as unknown."

With --directory option, ls-files --others shows untracked directories
without descending into them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-fetch: auto-following tags.
Junio C Hamano [Sat, 7 Jan 2006 08:48:04 +0000 (00:48 -0800)]
git-fetch: auto-following tags.

I added things to ls-remote so that Cogito can auto-follow tags
easily and correctly a while ago, but git-fetch did not use the
facility.  Recently added git-describe command relies on
repository keeping up-to-date set of tags, which made it much
more attractive to automatically follow tags, so we do that as
well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT 1.0.8 v1.0.8
Junio C Hamano [Sun, 8 Jan 2006 05:32:48 +0000 (21:32 -0800)]
GIT 1.0.8

15 years agomailsplit: allow empty input from stdin
Junio C Hamano [Sun, 8 Jan 2006 05:26:30 +0000 (21:26 -0800)]
mailsplit: allow empty input from stdin

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agorevert/cherry-pick: handle single quote in author name.
Junio C Hamano [Sun, 8 Jan 2006 04:45:11 +0000 (20:45 -0800)]
revert/cherry-pick: handle single quote in author name.

The same fix as aa66c7ec77d474b737da607d6cb2d07f56628def is
needed here.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix git-format-patch usage string wrt output modes.
Yann Dirson [Sun, 8 Jan 2006 00:39:16 +0000 (01:39 +0100)]
Fix git-format-patch usage string wrt output modes.

--stdout was not mentionned, and the description for the case where -o
was not given was thus incomplete.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix typo in debug stanza of t2001
Yann Dirson [Sun, 8 Jan 2006 00:38:43 +0000 (01:38 +0100)]
Fix typo in debug stanza of t2001

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotar-tree: finish honoring extractor's umask in git-tar-tree.
Junio C Hamano [Sat, 7 Jan 2006 23:11:11 +0000 (15:11 -0800)]
tar-tree: finish honoring extractor's umask in git-tar-tree.

Earlier commit 38ec15a973a1f075f0d94d130b0ef279562921cd forgot
to apply the same principle of not forcing go-w to the base
directory when specified.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Compilation: zero-length array declaration.
Junio C Hamano [Sat, 7 Jan 2006 09:33:54 +0000 (01:33 -0800)]
[PATCH] Compilation: zero-length array declaration.

ISO C99 (and GCC 3.x or later) lets you write a flexible array
at the end of a structure, like this:

struct frotz {
int xyzzy;
char nitfol[]; /* more */
};

GCC 2.95 and 2.96 let you to do this with "char nitfol[0]";
unfortunately this is not allowed by ISO C90.

This declares such construct like this:

struct frotz {
int xyzzy;
char nitfol[FLEX_ARRAY]; /* more */
};

and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and
empty for others.

If you are using a C90 C compiler, you should be able
to override this with CFLAGS=-DFLEX_ARRAY=1 from the
command line of "make".

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoprune: do not show error from pack-redundant when no packs are found.
Junio C Hamano [Sat, 7 Jan 2006 08:29:48 +0000 (00:29 -0800)]
prune: do not show error from pack-redundant when no packs are found.

When there is no pack yet, git-prune leaked an error message
from "git-pack-redundant --all" which complained that there is
no pack.  Squelch the annoying message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRetire debian/ directory.
Junio C Hamano [Sat, 7 Jan 2006 03:18:12 +0000 (19:18 -0800)]
Retire debian/ directory.

The official maintainer is keeping up-to-date quite well, and now
the older Debian is supported with backports.org, there is no reason
for me to keep debian/ directory around here.

I have not been building and publishing debs since 1.0.4 anyway.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agounpack-objects: default to quiet if stderr is not a tty.
Junio C Hamano [Sat, 7 Jan 2006 02:53:16 +0000 (18:53 -0800)]
unpack-objects: default to quiet if stderr is not a tty.

This would help cron/at jobs that run send-pack to mirror
repositories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSubstitute "/" with $opt_s in tag names as well as branch names
Joe English [Fri, 6 Jan 2006 20:52:27 +0000 (12:52 -0800)]
Substitute "/" with $opt_s in tag names as well as branch names

In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names,
but not in tag names, which is inconsistent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTeach cvsexportcommit to add new files
Yann Dirson [Fri, 6 Jan 2006 20:54:41 +0000 (21:54 +0100)]
Teach cvsexportcommit to add new files

"cvs add" support was already there, but the "unknown" status
returned when querying a file not yet known to cvs caused the
script to abort prematurely.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMake GIT-VERSION-GEN tolerate missing git describe command
John Ellson [Fri, 30 Dec 2005 16:23:17 +0000 (11:23 -0500)]
Make GIT-VERSION-GEN tolerate missing git describe command

I think it is probably a bug that "git non_existent_command"
returns its error message to stdout without an error, where
"git-non_existent_command" behaves differently and does return an
error.

Older versions of git did not implement "git describe"  and
GIT-VERSION-GEN produces an empty version string if run on
a system with such a git installed.  The consequence
is that "make rpm" fails.

This patch fixes GIT-VERSION-GEN so that it works in the
absence of a working "git describe"

Signed-off-by: John Ellson <ellson@research.att.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge fixes up to GIT 1.0.7
Junio C Hamano [Fri, 6 Jan 2006 04:54:42 +0000 (20:54 -0800)]
Merge fixes up to GIT 1.0.7

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGIT 1.0.7 v1.0.7
Junio C Hamano [Fri, 6 Jan 2006 04:52:50 +0000 (20:52 -0800)]
GIT 1.0.7

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix git-symbolic-ref typo in git.txt.
Jon Loeliger [Tue, 3 Jan 2006 14:38:15 +0000 (08:38 -0600)]
Fix git-symbolic-ref typo in git.txt.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit: grok 'help' to mean '--help'.
Andreas Ericsson [Tue, 3 Jan 2006 09:53:54 +0000 (10:53 +0100)]
git: grok 'help' to mean '--help'.

Most other scm's understand it, most users expect it and it's an easy fix.

Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation/git-svnimport: document -T and -t switches correctly
Eric Wong [Sun, 1 Jan 2006 21:32:53 +0000 (13:32 -0800)]
Documentation/git-svnimport: document -T and -t switches correctly

The -T and -t switches are swapped in the documentation and actual
code.  I've made the documentation match the code.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agosvnimport: support repositories requiring SSL authentication
Eric Wong [Sun, 1 Jan 2006 21:25:47 +0000 (13:25 -0800)]
svnimport: support repositories requiring SSL authentication

I looked at svn-mirror to see how it did this, seems about right.
"It works for me" when using it against https://svn.musicpd.org

tested command-line: git-svnimport -C mpc -i -m -v  \
-T mpc/trunk -b mpc/branches -t mpc/tags https://svn.musicpd.org

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agot3300: skip when filesystem does not like TAB in filenames.
Junio C Hamano [Fri, 6 Jan 2006 04:14:40 +0000 (20:14 -0800)]
t3300: skip when filesystem does not like TAB in filenames.

Instead of checking Cygwin explicitly, see if the filesystem lets us
create funny filenames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoformat-patch/commit: Quote single quote in the author name properly.
Junio C Hamano [Fri, 6 Jan 2006 03:50:37 +0000 (19:50 -0800)]
format-patch/commit: Quote single quote in the author name properly.

Noticed by Kyle McMartin.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-fetch --tags: reject malformed tags.
Junio C Hamano [Fri, 6 Jan 2006 03:42:12 +0000 (19:42 -0800)]
git-fetch --tags: reject malformed tags.

When the other end was prepared with older git and has tags that
do not follow the naming convention (see check-ref-format), do not
barf but simply reject to copy them.

Initial fix by Simon Richter, but done differently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoWrap synopsis lines and use [verse] to keep formatting
Jonas Fonseca [Sat, 31 Dec 2005 17:37:15 +0000 (18:37 +0100)]
Wrap synopsis lines and use [verse] to keep formatting

In addition, also fixes a few synopses to be more consistent and a gitlink.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agouse GIT_DIR instead of /var/tmp
Alex Riesen [Thu, 5 Jan 2006 11:52:07 +0000 (12:52 +0100)]
use GIT_DIR instead of /var/tmp

Not every system (will not one microsoft windows system) have /var/tmp,
whereas using GIT_DIR for random temporary files is more or less established.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: check, if t/trash directory was successfully created
Alex Riesen [Thu, 5 Jan 2006 11:57:36 +0000 (12:57 +0100)]
trivial: check, if t/trash directory was successfully created

and was successfully entered. Otherwise git-init-db will create it directly
in the working directory (t/) which can be dangerous.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: .gitignore precompiled python modules
Alex Riesen [Thu, 5 Jan 2006 16:38:58 +0000 (17:38 +0100)]
trivial: .gitignore precompiled python modules

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: use git-repo-config to detect how to run tests in the test repository
Alex Riesen [Thu, 5 Jan 2006 11:55:58 +0000 (12:55 +0100)]
trivial: use git-repo-config to detect how to run tests in the test repository

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: use git-repo-config to detect if the test can be run on the repository
Alex Riesen [Thu, 5 Jan 2006 11:55:03 +0000 (12:55 +0100)]
trivial: use git-repo-config to detect if the test can be run on the repository

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: remove the dots at the end of file names from merge-one-file
Alex Riesen [Thu, 5 Jan 2006 11:46:16 +0000 (12:46 +0100)]
trivial: remove the dots at the end of file names from merge-one-file

to make the output more friendly to mouse copy-paste.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: clarify, what are the config's user.name and user.email about
Alex Riesen [Thu, 5 Jan 2006 11:44:18 +0000 (12:44 +0100)]
trivial: clarify, what are the config's user.name and user.email about

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: typo in git-commit.sh
Alex Riesen [Thu, 5 Jan 2006 11:44:59 +0000 (12:44 +0100)]
trivial: typo in git-commit.sh

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agouse result of open(2) to check for presence
Alex Riesen [Thu, 5 Jan 2006 11:43:34 +0000 (12:43 +0100)]
use result of open(2) to check for presence

Not that the stat against open race would matter much in this context,
but that simplifies
the code a bit. Also some diagnostics added (why the open failed)

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agofix potential deadlock in create_one_file
Alex Riesen [Thu, 5 Jan 2006 09:00:12 +0000 (10:00 +0100)]
fix potential deadlock in create_one_file

It can happen if the temporary file already exists (i.e. after a panic
and reboot).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: O_EXCL makes O_TRUNC redundant
Alex Riesen [Thu, 5 Jan 2006 08:58:06 +0000 (09:58 +0100)]
trivial: O_EXCL makes O_TRUNC redundant

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotrivial: retval of waitpid is not errno
Alex Riesen [Thu, 5 Jan 2006 08:56:37 +0000 (09:56 +0100)]
trivial: retval of waitpid is not errno

...but is used as such and passed to strerror.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix nasty approxidate bug
Linus Torvalds [Thu, 5 Jan 2006 03:33:55 +0000 (19:33 -0800)]
Fix nasty approxidate bug

Stupid me.

If approxidate ends up with a month that is ahead of the current month, it
decrements the year to last year.

Which is correct, and means that "last december" does the right thing.

HOWEVER. It should only do so if the year is the same as the current year.

Without this fix, "5 days ago" ends up being in 2004, because it first
decrements five days, getting us to December 2005 (correct), but then it
also ends up decrementing the year once more to turn that December into
"last year" (incorrect, since it already _was_ last year).

Duh. Pass me a donut.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAIX compile fix for repo-config.c
Amos Waterland [Thu, 5 Jan 2006 00:31:02 +0000 (19:31 -0500)]
AIX compile fix for repo-config.c

AIX 5 has a /usr/include/regex.h containing this code:

 #ifdef  _NO_PROTO
 extern  char    *regex();
 extern  char    *regcmp();
 #else /* _NO_PROTO */
 extern  char    *regex(const char *, const char *, ...);
 extern  char    *regcmp(const char *, ...);
 #endif  /* _NO_PROTO */

This means that repo-config.c is trying to redefine the `regex' symbol.
Here is a simple patch that just uses `regexp' as the symbol name instead.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-init-db(1): Describe --shared and the idempotent nature of init-db
Jonas Fonseca [Sat, 31 Dec 2005 17:30:25 +0000 (18:30 +0100)]
git-init-db(1): Describe --shared and the idempotent nature of init-db

Based on the recent discussion on the mailing list.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago?alloc: do not return NULL when asked for zero bytes
Junio C Hamano [Thu, 29 Dec 2005 09:31:26 +0000 (01:31 -0800)]
?alloc: do not return NULL when asked for zero bytes

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agocode comments: spell
Junio C Hamano [Thu, 29 Dec 2005 09:30:08 +0000 (01:30 -0800)]
code comments: spell

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: spell.
Junio C Hamano [Thu, 29 Dec 2005 09:20:06 +0000 (01:20 -0800)]
Documentation: spell.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix skipping merge-order test with NO_OPENSSL=1.
Gerrit Pape [Wed, 28 Dec 2005 11:25:38 +0000 (12:25 +0100)]
Fix skipping merge-order test with NO_OPENSSL=1.

Move git-rev-list --merge-order usage check for 'OpenSSL not linked' after
test 1; we cannot trigger this unless we try to actually use --merge-order
by giving some ref, and we do not have any ref until we run the first test
to create commits.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge fixes up to GIT 1.0.6
Junio C Hamano [Wed, 28 Dec 2005 02:13:30 +0000 (18:13 -0800)]
Merge fixes up to GIT 1.0.6

15 years agoGIT 1.0.6 v1.0.6
Junio C Hamano [Wed, 28 Dec 2005 02:08:58 +0000 (18:08 -0800)]
GIT 1.0.6

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agosend-pack/receive-pack: allow errors to be reported back to pusher.
Junio C Hamano [Mon, 26 Dec 2005 07:18:37 +0000 (23:18 -0800)]
send-pack/receive-pack: allow errors to be reported back to pusher.

This updates the protocol between git-send-pack/git-receive-pack
in a backward compatible way to allow failures at the receiving
end to be propagated back to the sender.  Most notably, versions
of git-push before this could not notice if the update hook on
the receiving end refused to update the ref for its own policy
reasons.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMakefile: use git-describe to mark the git version.
Junio C Hamano [Tue, 27 Dec 2005 22:40:17 +0000 (14:40 -0800)]
Makefile: use git-describe to mark the git version.

Note: with this commit, the GIT maintainer workflow must change.
GIT-VERSION-GEN is now the file to munge when the default
version needs to be changed, not Makefile.  The tag needs to be
pushed into the repository to build the official tarball and
binary package beforehand.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-describe: documentation.
Junio C Hamano [Wed, 28 Dec 2005 00:10:56 +0000 (16:10 -0800)]
git-describe: documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-describe: still prefer annotated tag under --all and --tags
Junio C Hamano [Wed, 28 Dec 2005 00:09:37 +0000 (16:09 -0800)]
git-describe: still prefer annotated tag under --all and --tags

Even though --all and --tags can be used to include non
annotated tags in the reference point candidates, prefer to use
annotated tags if there are more than one refs that name the
same commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-describe: --tags and --abbrev
Junio C Hamano [Tue, 27 Dec 2005 22:40:17 +0000 (14:40 -0800)]
git-describe: --tags and --abbrev

With --tags, not just annontated tags, but also any ref under
refs/tags/ are used to name the revision.

The number of digits is configurable with the --abbrev=<n> option.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-describe: use find_unique_abbrev()
Junio C Hamano [Tue, 27 Dec 2005 22:49:22 +0000 (14:49 -0800)]
git-describe: use find_unique_abbrev()

Just in case 8 hexadecimal digits are not enough.  We could use
shorter default if we wanted to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-describe: really prefer tags only.
Junio C Hamano [Tue, 27 Dec 2005 22:36:49 +0000 (14:36 -0800)]
git-describe: really prefer tags only.

Often there are references other than annotated tags under
refs/tags hierarchy that are used to "keep things just in case".
default to use annotated tags only, still leaving the option to
use any ref with --all flag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd a "git-describe" command
Linus Torvalds [Sat, 24 Dec 2005 21:50:45 +0000 (13:50 -0800)]
Add a "git-describe" command

It shows you the most recent tag that is reachable from a particular
commit is.

Maybe this is something that "git-name-rev" should be taught to do,
instead of having a separate command for it. Regardless, I find it useful.

What it does is to take any random commit, and "name" it by looking up the
most recent commit that is tagged and reachable from that commit. If the
match is exact, it will just print out that ref-name directly. Otherwise
it will print out the ref-name, followed by the 8-character "short SHA".

IOW, with something like Junios current tree, I get:

[torvalds@g5 git]$ git-describe parent
refs/tags/v1.0.4-g2414721b

ie the current head of my "parent" branch (ie Junio) is based on v1.0.4,
but since it has a few commits on top of that, it has added the git hash
of the thing to the end: "-g" + 8-char shorthand for the commit
2414721b194453f058079d897d13c4e377f92dc6.

Doing a "git-describe" on a tag-name will just show the full tag path:

[torvalds@g5 git]$ git-describe v1.0.4
refs/tags/v1.0.4

unless there are _other_ tags pointing to that commit, in which case it
will just choose one at random.

This is useful for two things:

 - automatic version naming in Makefiles, for example. We could use it in
   git itself: when doing "git --version", we could use this to give a
   much more useful description of exactly what version was installed.

 - for any random commit (say, you use "gitk <pathname>" or
   "git-whatchanged" to look at what has changed in some file), you can
   figure out what the last version of the repo was. Ie, say I find a bug
   in commit 39ca371c45b04cd50d0974030ae051906fc516b6, I just do:

[torvalds@g5 linux]$ git-describe 39ca371c45b04cd50d0974030ae051906fc516b6
refs/tags/v2.6.14-rc4-g39ca371c

   and I now know that it was _not_ in v2.6.14-rc4, but was presumably in
   v2.6.14-rc5.

The latter is useful when you want to see what "version timeframe" a
commit happened in.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDo not mark tags fetched via --tags flag as mergeable
Junio C Hamano [Tue, 27 Dec 2005 19:52:51 +0000 (11:52 -0800)]
Do not mark tags fetched via --tags flag as mergeable

Otherwise "git pull --tags" would mistakenly try to merge all of
them, which is never what the user wants.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix bogus tests on rev-list output.
Junio C Hamano [Tue, 27 Dec 2005 19:06:43 +0000 (11:06 -0800)]
Fix bogus tests on rev-list output.

These tests seem to mean checking the output with expected
result, but was not doing its handrolled test helper function.

Also fix the guard to workaround wc output that have whitespace
padding, which was broken but not exposed because the test was
not testing it ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoGuard a test against wc that pads its output with whitespace
Junio C Hamano [Tue, 27 Dec 2005 18:51:23 +0000 (10:51 -0800)]
Guard a test against wc that pads its output with whitespace

Spotted by Johannes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agocopy_fd: close ifd on error
Sam Ravnborg [Tue, 27 Dec 2005 08:19:05 +0000 (09:19 +0100)]
copy_fd: close ifd on error

In copy_fd when write fails we ought to close input file descriptor.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge fixes up to GIT 1.0.5
Junio C Hamano [Tue, 27 Dec 2005 02:45:30 +0000 (18:45 -0800)]
Merge fixes up to GIT 1.0.5

15 years agoGIT 1.0.5 v1.0.5
Junio C Hamano [Tue, 27 Dec 2005 02:44:15 +0000 (18:44 -0800)]
GIT 1.0.5

Minor fixes.

Starting from this one I won't be touching debian/ directory
since the official maintainer seems to be reasonably quick to
package up things.  The packaging procedure used there seems to
be quite different from what I have, so I'd like to avoid
potential confusion and reduce work by the official maintainer
and myself.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoHandle symlinks graciously
Johannes Schindelin [Mon, 26 Dec 2005 21:31:42 +0000 (22:31 +0100)]
Handle symlinks graciously

This patch converts a stat() to an lstat() call, thereby fixing the case
when the date of a symlink was not the same as the one recorded in the
index. The included test case demonstrates this.

This is for the case that the symlink points to a non-existing file. If
the file exists, worse things than just an error message happen.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>