git/git.git
14 years agorename --exec to --upload-pack for fetch-pack and peek-remote
Uwe Kleine-König [Tue, 23 Jan 2007 08:20:17 +0000 (09:20 +0100)]
rename --exec to --upload-pack for fetch-pack and peek-remote

Just some option name disambiguation.  This is the counter part to
commit d23842fd which made a similar change for push and send-pack.

--exec continues to work.

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: --amend cannot be combined with -c/-C/-F.
Peter Eriksen [Wed, 24 Jan 2007 19:54:46 +0000 (20:54 +0100)]
Documentation: --amend cannot be combined with -c/-C/-F.

We used to get the following confusing error message:

    $ git commit --amend -a -m foo
    Option -m cannot be combined with -c/-C/-F

This is because --amend cannot be combined with -c/-C/-F, which makes
sense, because they try to handle the same log message in different ways.
So update the documentation to reflect this.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/config.txt: Correct info about subsection name
Jakub Narebski [Wed, 24 Jan 2007 14:14:33 +0000 (15:14 +0100)]
Documentation/config.txt: Correct info about subsection name

Contrary to variable values, in subsection names parsing character
escape codes (besides literal escaping of " as \", and \ as \\)
is not performed; subsection name cannot contain newlines.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-daemon documentation on enabling services.
Junio C Hamano [Wed, 24 Jan 2007 23:29:07 +0000 (15:29 -0800)]
git-daemon documentation on enabling services.

Noticed by Franck Bui-Huu.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoreflog inspection: introduce shortcut "-g"
Johannes Schindelin [Wed, 24 Jan 2007 14:05:16 +0000 (15:05 +0100)]
reflog inspection: introduce shortcut "-g"

A short-hand "-g" for "git log --walk-reflogs" and "git
show-branch --reflog" makes it easier to access the reflog
info.

[jc: added -g to show-branch for symmetry]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoannotate: use pager
Johannes Schindelin [Wed, 24 Jan 2007 14:04:37 +0000 (15:04 +0100)]
annotate: use pager

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agot/t1300-repo-config.sh: value continued on next line
Jakub Narebski [Tue, 23 Jan 2007 12:37:25 +0000 (13:37 +0100)]
t/t1300-repo-config.sh: value continued on next line

Documentation/config.txt:
  Variable value ending in a '`\`' is continued on the next line in the
  customary UNIX fashion.

Test it.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-checkout -m: fix merge case
Junio C Hamano [Wed, 24 Jan 2007 00:51:22 +0000 (16:51 -0800)]
git-checkout -m: fix merge case

Commit c1a4278e switched the "merging checkout" implementation
from 3-way read-tree to merge-recursive, but forgot that
merge-recursive will signal an unmerged state with its own exit
status code.  This prevented the clean-up phase (paths cleanly
merged should not be updated in the index) from running.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoreflog gc: a tag that does not point at a commit is not a crime.
Junio C Hamano [Tue, 23 Jan 2007 05:39:03 +0000 (21:39 -0800)]
reflog gc: a tag that does not point at a commit is not a crime.

Although unusual, tags can point at any object.  Warning only
once is fine, but warning every time about the same tag gets
annoying.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agocontrib/vim: update syntax for changed commit template
Jeff King [Tue, 23 Jan 2007 03:21:15 +0000 (22:21 -0500)]
contrib/vim: update syntax for changed commit template

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoformat-patch: fix bug with --stdout in a subdirectory
Jeff King [Tue, 23 Jan 2007 03:38:28 +0000 (22:38 -0500)]
format-patch: fix bug with --stdout in a subdirectory

We set the output directory to the git subdirectory prefix if one has
not already been specified. However, in the case of --stdout, we
explicitly _don't_ want the output directory to be set. The result was
that "git-format-patch --stdout" in a directory besides the project root
produced the "standard output, or directory, which one?" error message.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years ago[PATCH] honor --author even with --amend, -C, and -c.
Junio C Hamano [Mon, 22 Jan 2007 21:03:31 +0000 (13:03 -0800)]
[PATCH] honor --author even with --amend, -C, and -c.

Earlier code discarded GIT_AUTHOR_DATE taken from the base
commit when --author was specified.  This was often wrong as
that use is likely to fix the spelling of author's name.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years ago.mailmap: fix screw-ups in Uwe's name
Junio C Hamano [Tue, 23 Jan 2007 00:25:15 +0000 (16:25 -0800)]
.mailmap: fix screw-ups in Uwe's name

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-svn: remove leading slash when printing removed directories
Eric Wong [Mon, 22 Jan 2007 20:25:30 +0000 (12:25 -0800)]
git-svn: remove leading slash when printing removed directories

Not sure why it was there in the first place, we always do our
work relative to the URL we're connected to; even if that URL is
the root of the repository, so the leading slash is pointless...
Lets be consistent when printing things for the user to see.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosha1_file.c: Avoid multiple calls to find_pack_entry().
Peter Eriksen [Mon, 22 Jan 2007 20:29:45 +0000 (21:29 +0100)]
sha1_file.c: Avoid multiple calls to find_pack_entry().

We used to call find_pack_entry() twice from read_sha1_file() in order
to avoid printing an error message, when the object did not exist.  This
is fixed by moving the call to error() to the only place it really
could be called.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/config.txt: Document config file syntax better
Jakub Narebski [Mon, 22 Jan 2007 15:25:47 +0000 (16:25 +0100)]
Documentation/config.txt: Document config file syntax better

Separate part of Documentation/config.txt which deals with git config file
syntax into "Syntax" subsection, and expand it.  Add information about
subsections, boolean values, escaping and escape sequences in string
values, and continuing variable value on the next line.

Add also proxy settings to config file example to show example of
partially enclosed in double quotes string value.

Parts based on comments by Junio C Hamano, Johannes Schindelin,
config.c, and the smb.conf(5) man page.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agocvsimport: activate -a option, really.
Junio C Hamano [Mon, 22 Jan 2007 20:20:14 +0000 (12:20 -0800)]
cvsimport: activate -a option, really.

An earlier commit ded9f400 added $opt_a support to disable the
cvsps grace period mechanism, but forgot to tell the option
parser about it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoCleanup uninitialized value in chomp
Alex Riesen [Mon, 22 Jan 2007 14:58:03 +0000 (15:58 +0100)]
Cleanup uninitialized value in chomp

which happens if you use ActiveState Perl and a
pipe workaround specially for it.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoForce Activestate Perl to tie git command pipe handle to a handle class
Alex Riesen [Mon, 22 Jan 2007 16:16:05 +0000 (17:16 +0100)]
Force Activestate Perl to tie git command pipe handle to a handle class

Otherwise it tries to tie it to a scalar and complains about missing
method. Dunno why, may be ActiveState brokenness again.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Acked-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoInsert ACTIVESTATE_STRING in Git.pm
Alex Riesen [Mon, 22 Jan 2007 16:14:56 +0000 (17:14 +0100)]
Insert ACTIVESTATE_STRING in Git.pm

Also add "git" to the pipe parameters, otherwise it does not work at all, as
no git commands are usable out of git context.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofsck-objects: refactor checking for connectivity
Linus Torvalds [Mon, 22 Jan 2007 06:26:41 +0000 (22:26 -0800)]
fsck-objects: refactor checking for connectivity

This separates the connectivity check into separate codepaths,
one for reachable objects and the other for unreachable ones,
while adding a lot of comments to explain what is going on.

When checking an unreachable object, unlike a reachable one, we
do not have to complain if it does not exist (we used to
complain about a missing blob even when the only thing that
references it is a tree that is dangling).  Also we do not have
to check and complain about objects that are referenced by an
unreachable object.

This makes the messages from fsck-objects a lot less noisy and
more useful.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-gc: do not run git-prune by default.
Junio C Hamano [Mon, 22 Jan 2007 07:28:28 +0000 (23:28 -0800)]
git-gc: do not run git-prune by default.

git-prune is not safe when run uncontrolled in parallel while
other git operations are creating new objects.  To avoid
mistakes, do not run git-prune by default from git-gc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoshallow repository: disable unsupported operations for now.
Junio C Hamano [Mon, 22 Jan 2007 06:23:58 +0000 (22:23 -0800)]
shallow repository: disable unsupported operations for now.

We currently do not support fetching/cloning from a shallow repository
nor pushing into one.  Make sure these are not attempted so that we
do not have to worry about corrupting repositories needlessly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agois_repository_shallow(): prototype fix.
Junio C Hamano [Mon, 22 Jan 2007 06:22:23 +0000 (22:22 -0800)]
is_repository_shallow(): prototype fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMake sure git_connect() always give two file descriptors.
Junio C Hamano [Mon, 22 Jan 2007 01:10:51 +0000 (17:10 -0800)]
Make sure git_connect() always give two file descriptors.

Earlier, git_connect() returned the same fd twice or two
separate fds, depending on the way the connection was made (when
we are talking to the other end over a single socket, we used
the same fd twice, and when our end is connected to a pipepair
we used two).

This forced callers who do close() and dup() to really care
which was which, and most of the existing callers got this
wrong, although without much visible ill effect.  Many were
closing the same fd twice when we are talking over a single
socket, and one was leaking a fd.

This fixes it to uniformly use two separate fds, so if somebody
wants to close only reader side can just do close() on it
without worrying about it accidentally also closing the writer
side or vice versa.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRevert "prune: --grace=time"
Junio C Hamano [Mon, 22 Jan 2007 05:29:44 +0000 (21:29 -0800)]
Revert "prune: --grace=time"

This reverts commit 9b088c4e394df84232cfd37aea78349a495b09c1.

Protecting 'mature' objects does not make it any safer.  We should
admit that git-prune is inherently unsafe when run in parallel with
other operations without involving unwarranted locking overhead,
and with the latest git, even rebase and reset would not immediately
create crufts anyway.

14 years agoDocumentation/tutorial-2: Fix interesting typo in an example.
Junio C Hamano [Mon, 22 Jan 2007 05:24:05 +0000 (21:24 -0800)]
Documentation/tutorial-2: Fix interesting typo in an example.

Marco Candrian noticed that one cat-file example refers to a
blob object that is never used in the example sequence.

The bug is interesting in that the output from the botched
sample command is consistent with the incorrect blob object
name ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoGIT v1.5.0-rc2 v1.5.0-rc2
Junio C Hamano [Sun, 21 Jan 2007 07:44:55 +0000 (23:44 -0800)]
GIT v1.5.0-rc2

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoprune: --grace=time
Matthias Lederhofer [Fri, 19 Jan 2007 10:49:35 +0000 (11:49 +0100)]
prune: --grace=time

This option gives grace period to objects that are unreachable
from the refs from getting pruned.

The default value is 24 hours and may be changed using
gc.prunegrace.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years ago--walk-reflogs: do not crash with cyclic reflog ancestry
Johannes Schindelin [Sat, 20 Jan 2007 21:28:16 +0000 (22:28 +0100)]
--walk-reflogs: do not crash with cyclic reflog ancestry

Since you can reset --hard to any revision you already had, when
traversing the reflog ancestry, we may not free() the commit buffer.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years ago--walk-reflogs: actually find the right commit by date.
Johannes Schindelin [Sat, 20 Jan 2007 09:49:15 +0000 (10:49 +0100)]
--walk-reflogs: actually find the right commit by date.

Embarassing thinko.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
14 years agoFix --walk-reflog with --pretty=oneline
Junio C Hamano [Sat, 20 Jan 2007 08:51:41 +0000 (00:51 -0800)]
Fix --walk-reflog with --pretty=oneline

Now, "git log --abbrev-commit --pretty=o --walk-reflogs HEAD" is
reasonably pleasant to use.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoreflog-walk: build fixes
Junio C Hamano [Sat, 20 Jan 2007 08:47:34 +0000 (00:47 -0800)]
reflog-walk: build fixes

Dependency on reflog-walk.h was missing in the Makefile, and
reflog-walk.c did not even include it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agolog --walk-reflog: documentation
Junio C Hamano [Sat, 20 Jan 2007 07:21:32 +0000 (23:21 -0800)]
log --walk-reflog: documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years ago--walk-reflogs: disallow uninteresting commits
Johannes Schindelin [Sat, 20 Jan 2007 02:28:19 +0000 (03:28 +0100)]
--walk-reflogs: disallow uninteresting commits

Do not allow uninteresting commits with --walk-reflogs, since it is
not clear what should be shown in these cases:

$ git log --walk-reflogs master..next
$ git log --walk-reflogs ^master

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
14 years agoTeach the revision walker to walk by reflogs with --walk-reflogs
Johannes Schindelin [Thu, 11 Jan 2007 10:47:48 +0000 (11:47 +0100)]
Teach the revision walker to walk by reflogs with --walk-reflogs

When called with "--walk-reflogs", as long as there are reflogs
available, the walker will take this information into account, rather
than the parent information in the commit object.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-rebase: allow rebasing a detached HEAD.
Junio C Hamano [Sun, 21 Jan 2007 03:11:29 +0000 (19:11 -0800)]
git-rebase: allow rebasing a detached HEAD.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agobranch -f: no reason to forbid updating the current branch in a bare repo.
Junio C Hamano [Sat, 20 Jan 2007 18:51:37 +0000 (10:51 -0800)]
branch -f: no reason to forbid updating the current branch in a bare repo.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-tag -d: allow deleting multiple tags at once.
Junio C Hamano [Sat, 20 Jan 2007 18:47:41 +0000 (10:47 -0800)]
git-tag -d: allow deleting multiple tags at once.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDo not verify filenames in a bare repository
Johannes Schindelin [Sat, 20 Jan 2007 02:09:34 +0000 (03:09 +0100)]
Do not verify filenames in a bare repository

For example, it makes no sense to check the presence of a file
named "HEAD" when calling "git log HEAD" in a bare repository.

Noticed by Han-Wen Nienhuys.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
14 years agoStop ignoring Documentation/README
Junio C Hamano [Sat, 20 Jan 2007 07:52:06 +0000 (23:52 -0800)]
Stop ignoring Documentation/README

We do not copy this file from elsewhere anymore.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoapply --cached: fix crash in subdirectory
Johannes Schindelin [Sun, 21 Jan 2007 01:17:19 +0000 (02:17 +0100)]
apply --cached: fix crash in subdirectory

The static variable "prefix" was shadowed by an unused parameter
of the same name. In case of execution in a subdirectory, the
static variable was accessed, leading to a crash.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
14 years agoshow-branch --reflog: fix show_date() call
Junio C Hamano [Sun, 21 Jan 2007 02:57:06 +0000 (18:57 -0800)]
show-branch --reflog: fix show_date() call

Not passing tz to show_date() is not a fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoshow_date(): fix relative dates
Johannes Schindelin [Sat, 20 Jan 2007 21:21:38 +0000 (22:21 +0100)]
show_date(): fix relative dates

We pass a timestamp (i.e. number of seconds elapsed since Jan 1 1970,
00:00:00 GMT) to the function. So there is no need to "fix" the
timestamp according to the timezone.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
14 years agoshow-branch --reflog: tighten input validation.
Junio C Hamano [Sat, 20 Jan 2007 06:51:49 +0000 (22:51 -0800)]
show-branch --reflog: tighten input validation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoshow-branch --reflog: show the reflog message at the top.
Junio C Hamano [Fri, 19 Jan 2007 09:20:23 +0000 (01:20 -0800)]
show-branch --reflog: show the reflog message at the top.

This changes the output so the list at the top shows the reflog
message, along with their relative timestamps.

You can use --reflog=<n> to show <n> most recent log entries, or
use --reflog=<n>,<b> to show <n> entries going back from the
entry <b>.  <b> can be either a number (so --reflog=4,20 shows 4
records starting from @{20}) or a timestamp (e.g. --reflog='4,1 day').

Here is a sample output (with --list option):

  $ git show-branch --reflog=10 --list jc/show-reflog
    [jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
    [jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
    [jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog: sho
    [jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog: sho
    [jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_ref_a
    [jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read_ref_a
    [jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend read_ref_a
    [jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow retrievi
    [jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
    [jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --reflog: use

This shows what I did more cleanly:

  $ git show-branch --reflog=10 jc/show-reflog
  ! [jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
   ! [jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
    ! [jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog:
     ! [jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog:
      ! [jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_
       ! [jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read
        ! [jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend rea
         ! [jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow
          ! [jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
           ! [jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --r
  ----------
  +          [jc/show-reflog@{0}] show-branch --reflog: show the reflog
    +        [jc/show-reflog@{2}] show-branch --reflog: show the reflog
   +++       [jc/show-reflog@{1}] show-branch --reflog: show the reflog
  +++++      [jc/show-reflog@{4}] Extend read_ref_at() to be usable fro
       +     [jc/show-reflog@{5}] Extend read_ref_at() to be usable fro
        +    [jc/show-reflog@{6}] Extend read_ref_at() to be usable fro
         +   [jc/show-reflog@{7}] read_ref_at(): allow retrieving the r
           + [jc/show-reflog@{9}] show-branch --reflog: use updated rea
           + [jc/show-reflog@{9}^] read_ref_at(): allow reporting the c
           + [jc/show-reflog@{9}~2] show-branch --reflog: show the refl
           + [jc/show-reflog@{9}~3] read_ref_at(): allow retrieving the
  ++++++++++ [jc/show-reflog@{8}] dwim_ref(): Separate name-to-ref DWIM

At @{9}, I had a commit to complete 5 patch series, but I wanted
to consolidate two commits that enhances read_ref_at() into one
(they were @{9}^ and @{9}~3), and another two that touch show-branch
into one (@{9} and @{9}~2).

I first saved them with "format-patch -4", and then did a reset
at @{8}.  At @{7}, I applied one of them with "am", and then
used "git-apply" on the other one, and amended the commit at
@{6} (so @{6} and @{7} has the same parent).  I did not like the
log message, so I amended again at @{5}.

Then I cherry-picked @{9}~2 to create @{3} (the log message
shows that it needs to learn to set GIT_REFLOG_ACTION -- it uses
"git-commit" and the log entry is attributed for it).  Another
cherry-pick built @{2} out of @{9}, but what I wanted to do was
to squash these two into one, so I did a "reset HEAD^" at @{1}
and then made the final commit by amending what was at the top.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoExtend read_ref_at() to be usable from places other than sha1_name.
Junio C Hamano [Fri, 19 Jan 2007 09:19:05 +0000 (01:19 -0800)]
Extend read_ref_at() to be usable from places other than sha1_name.

You can pass an extra argument to the function to receive the
reflog message information.  Also when the log does not go back
beyond the point the user asked, the cut-off time and count are
given back to the caller for emitting the error messages as
appropriately.

We could later add configuration for get_sha1_basic() to make it
an error instead of it being just a warning.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agodwim_ref(): Separate name-to-ref DWIM code out.
Junio C Hamano [Fri, 19 Jan 2007 09:15:15 +0000 (01:15 -0800)]
dwim_ref(): Separate name-to-ref DWIM code out.

I'll be using this in another function to figure out what to
pass to resolve_ref().

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoconfig_set_multivar(): disallow newlines in keys
Johannes Schindelin [Sat, 20 Jan 2007 01:25:37 +0000 (02:25 +0100)]
config_set_multivar(): disallow newlines in keys

This will no longer work:

$ git repo-config 'key.with
newline' some-value

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
14 years agorename --exec to --receive-pack for push and send-pack
Uwe Kleine-König [Fri, 19 Jan 2007 12:49:27 +0000 (13:49 +0100)]
rename --exec to --receive-pack for push and send-pack

For now it's just to get a more descriptive name.  Later we might update the
push protocol to run more than one program on the other end.  Moreover this
matches better the corresponding config option remote.<name>. receivepack.

--exec continues to work

Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agomake --exec=... option to git-push configurable
Uwe Kleine-König [Fri, 19 Jan 2007 12:46:16 +0000 (13:46 +0100)]
make --exec=... option to git-push configurable

Having to specify git push --exec=... is annoying if you cannot have
git-receivepack in your PATH on the remote side (or don't want to).

This introduces the config item remote.<name>.receivepack to override
the default value (which is "git-receive-pack").

Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUpdate documentation of fetch-pack, push and send-pack
Uwe Kleine-König [Fri, 19 Jan 2007 12:43:00 +0000 (13:43 +0100)]
Update documentation of fetch-pack, push and send-pack

add all supported options to Documentation/git-....txt and the usage strings.

Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git.txt: command re-classification
Junio C Hamano [Fri, 19 Jan 2007 06:32:38 +0000 (22:32 -0800)]
Documentation/git.txt: command re-classification

This adds two new classes (pure-helpers and "Interacting with
Others") to the command list in the main manual page.  The
latter class is primarily about foreign SCM interface and is
placed before low-level (plumbing) commands.

Also it promotes a handful commands to mainporcelain category
while demoting some others.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: generated cmds-*.txt does not depend on git.txt
Junio C Hamano [Fri, 19 Jan 2007 19:33:27 +0000 (11:33 -0800)]
Documentation: generated cmds-*.txt does not depend on git.txt

Pointed out by Santi.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agorefs.c::read_ref_at(): fix bogus munmap() call.
Junio C Hamano [Fri, 19 Jan 2007 08:39:32 +0000 (00:39 -0800)]
refs.c::read_ref_at(): fix bogus munmap() call.

The code uses mmap() to read reflog data, but moves the pointer around
while reading, and uses that updated pointer in the call to munmap().

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agofor_each_reflog_ent: do not leak FILE *
Junio C Hamano [Fri, 19 Jan 2007 07:25:54 +0000 (23:25 -0800)]
for_each_reflog_ent: do not leak FILE *

The callback function can signal an early return by returning non-zero,
but the function leaked the FILE * opened on the reflog when doing so.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: Generate command lists.
Junio C Hamano [Fri, 19 Jan 2007 00:02:13 +0000 (16:02 -0800)]
Documentation: Generate command lists.

This moves the source of the list of commands and categorization
to the end of Documentation/cmd-list.perl, so that re-categorization
and re-ordering would become easier to manage.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: sync git.txt command list and manual page title
Junio C Hamano [Thu, 18 Jan 2007 23:53:37 +0000 (15:53 -0800)]
Documentation: sync git.txt command list and manual page title

Also reorders a handful entries to make each list sorted
alphabetically.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: move command list in git.txt into separate files.
Junio C Hamano [Thu, 18 Jan 2007 23:03:13 +0000 (15:03 -0800)]
Documentation: move command list in git.txt into separate files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoprune-packed: add -q to usage
Matthias Lederhofer [Thu, 18 Jan 2007 16:11:13 +0000 (17:11 +0100)]
prune-packed: add -q to usage

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocument --ignore-if-in-upstream in git-format-patch
David Kågedal [Thu, 18 Jan 2007 11:27:35 +0000 (12:27 +0100)]
Document --ignore-if-in-upstream in git-format-patch

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoShell syntax fix in git-reset
David Kågedal [Thu, 18 Jan 2007 11:15:13 +0000 (12:15 +0100)]
Shell syntax fix in git-reset

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse standard -t option for touch.
Simon 'corecode' Schubert [Thu, 18 Jan 2007 10:18:51 +0000 (11:18 +0100)]
Use standard -t option for touch.

Non-GNU touch do not have the -d option to take free form
date strings.  The POSIX -t option should be more widespread.
For this to work, date needs to output YYYYMMDDHHMM.SS date strings.

Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse fixed-size integers for .idx file I/O
Junio C Hamano [Thu, 18 Jan 2007 07:17:28 +0000 (23:17 -0800)]
Use fixed-size integers for .idx file I/O

This attempts to finish what Simon started in the previous commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse fixed-size integers for the on-disk pack structure.
Simon 'corecode' Schubert [Wed, 17 Jan 2007 08:07:23 +0000 (09:07 +0100)]
Use fixed-size integers for the on-disk pack structure.

Plain integer types without a fixed size can vary between platforms.  Even
though all common platforms use 32-bit ints, there is no guarantee that
this won't change at some point.  Furthermore, specifying an integer type
with explicit size makes the definition of structures more obvious.

Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-format-patch: the default suffix is now .patch, not .txt
Junio C Hamano [Wed, 17 Jan 2007 23:03:39 +0000 (15:03 -0800)]
git-format-patch: the default suffix is now .patch, not .txt

Editors often give easier handling of patch files if the
filename ends with .patch, so use it instead of .txt.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-format-patch: make --binary on by default
Junio C Hamano [Wed, 17 Jan 2007 22:32:52 +0000 (14:32 -0800)]
git-format-patch: make --binary on by default

It does not make much sense to generate a patch that cannot be
applied.  If --text is specified on the command line it still
takes precedence.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoAdd --summary to git-format-patch by default
Junio C Hamano [Wed, 17 Jan 2007 21:51:44 +0000 (13:51 -0800)]
Add --summary to git-format-patch by default

This adds --summary output in addition to the --stat to the
output from git-format-patch by default.

I think additions, removals and filemode changes are rare but
notable events and always showing it makes sense.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-format-patch -3
Junio C Hamano [Wed, 17 Jan 2007 21:35:13 +0000 (13:35 -0800)]
git-format-patch -3

This teaches "git-format-patch" to honor the --max-count
parameter revision traversal machinery takes, so that you can
say "git-format-patch -3" to process the three topmost commits
from the current HEAD (or "git-format-patch -2 topic" to name a
specific branch).

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocument pack .idx file format upgrade strategy.
Shawn O. Pearce [Thu, 18 Jan 2007 01:43:57 +0000 (20:43 -0500)]
Document pack .idx file format upgrade strategy.

Way back when Junio developed the 64 bit index topic he came up
with a means of changing the .idx file format so that older Git
clients would recognize that they don't understand the file and
refuse to read it, while newer clients could tell the difference
between the old-style and new-style .idx files.  Unfortunately
this wasn't recorded anywhere.

This change documents how we might go about changing the .idx
file format by using a special signature in the first four bytes.
Credit (and possible blame) goes completely to Junio for thinking
up this technique.

The change also modifies the error message of the current Git code
so that users get a recommendation to upgrade their Git software
should this version or later encounter a new-style .idx which it
cannot process.  We already do this for the .pack files, but since
we usually process the .idx files first its important that these
files are recognized and encourage an upgrade.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoRefer users to git-rev-parse for revision specification syntax.
Shawn O. Pearce [Thu, 18 Jan 2007 02:08:09 +0000 (21:08 -0500)]
Refer users to git-rev-parse for revision specification syntax.

The revision specification syntax (sometimes referred to as
SHA1-expressions) is accepted almost everywhere in Git by
almost every tool.  Unfortunately it is only documented in
git-rev-parse.txt, and most users don't know to look there.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocument the master@{n} reflog query syntax.
Shawn O. Pearce [Thu, 18 Jan 2007 02:08:04 +0000 (21:08 -0500)]
Document the master@{n} reflog query syntax.

In ab2a1a32 Junio improved the reflog query logic to support
obtaining the n-th prior value of a ref, but this was never
documented in git-rev-parse.  Now it is.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-parse-remote.txt: we deal with config vars as well
Junio C Hamano [Wed, 17 Jan 2007 21:06:32 +0000 (13:06 -0800)]
Documentation/git-parse-remote.txt: we deal with config vars as well

... but we never documented it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: m can be relative in "git-blame -Ln,m"
Junio C Hamano [Wed, 17 Jan 2007 21:04:15 +0000 (13:04 -0800)]
Documentation: m can be relative in "git-blame -Ln,m"

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: suggest corresponding Porcelain-level in plumbing docs.
Junio C Hamano [Wed, 17 Jan 2007 21:03:29 +0000 (13:03 -0800)]
Documentation: suggest corresponding Porcelain-level in plumbing docs.

Instead of keeping the confused end user reading low-level
documentation, suggest the higher level commands that implement
what the user may want to do using them upfront.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-resolve: deprecated.
Junio C Hamano [Wed, 17 Jan 2007 21:00:23 +0000 (13:00 -0800)]
Documentation/git-resolve: deprecated.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agosanitize content of README file
Nicolas Pitre [Wed, 17 Jan 2007 18:04:39 +0000 (13:04 -0500)]
sanitize content of README file

Current README content is way too esoteric for someone looking at GIT
for the first time. Instead it should provide a quick summary of what
GIT is with a few pointers to other resources.

The bulk of the previous README content is moved to
Documentation/core-intro.txt.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-format-patch: do not crash with format.headers without value.
Junio C Hamano [Wed, 17 Jan 2007 19:13:02 +0000 (11:13 -0800)]
git-format-patch: do not crash with format.headers without value.

An incorrect config file can say:

[format]
headers

and crash the parsing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoIntroduce 'git-format-patch --suffix=.patch'
Junio C Hamano [Wed, 17 Jan 2007 19:12:03 +0000 (11:12 -0800)]
Introduce 'git-format-patch --suffix=.patch'

The default can also be changed with "format.suffix" configuration.
Leaving it empty would not add any suffix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/glossary.txt: describe remotes/ tracking and packed-refs
Junio C Hamano [Wed, 17 Jan 2007 18:54:58 +0000 (10:54 -0800)]
Documentation/glossary.txt: describe remotes/ tracking and packed-refs

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/glossary.txt: unpacked objects are loose.
Junio C Hamano [Wed, 17 Jan 2007 18:54:18 +0000 (10:54 -0800)]
Documentation/glossary.txt: unpacked objects are loose.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: describe shallow repository
Junio C Hamano [Wed, 17 Jan 2007 18:53:31 +0000 (10:53 -0800)]
Documentation: describe shallow repository

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoMake a short-and-sweet "git-add -i" synonym for "git-add --interactive"
Junio C Hamano [Wed, 17 Jan 2007 18:52:36 +0000 (10:52 -0800)]
Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: detached HEAD
Junio C Hamano [Wed, 17 Jan 2007 18:43:50 +0000 (10:43 -0800)]
Documentation: detached HEAD

Add discussion section to git-checkout documentation and mention
detached HEAD in repository-layout document.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation: a few spelling fixes
René Scharfe [Wed, 17 Jan 2007 15:32:41 +0000 (16:32 +0100)]
Documentation: a few spelling fixes

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-sh-setup.txt: programmer's docs
Junio C Hamano [Wed, 17 Jan 2007 09:13:05 +0000 (01:13 -0800)]
Documentation/git-sh-setup.txt: programmer's docs

Clarify that this is not meant for end users, and list what
shell functions are defined.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-whatchanged.txt: show -<n> instead of --max-count.
Junio C Hamano [Wed, 17 Jan 2007 09:11:56 +0000 (01:11 -0800)]
Documentation/git-whatchanged.txt: show -<n> instead of --max-count.

... to match the change we did earlier to git-log documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-status.txt: mention color configuration
Junio C Hamano [Wed, 17 Jan 2007 09:11:01 +0000 (01:11 -0800)]
Documentation/git-status.txt: mention color configuration

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-tar-tree.txt: default umask is now 002
Junio C Hamano [Wed, 17 Jan 2007 09:10:13 +0000 (01:10 -0800)]
Documentation/git-tar-tree.txt: default umask is now 002

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-tools.txt: mention tig and refer to wiki
Junio C Hamano [Wed, 17 Jan 2007 09:09:41 +0000 (01:09 -0800)]
Documentation/git-tools.txt: mention tig and refer to wiki

In general list at Wiki seems to be maintained a lot better than
this list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/git-tag: the command can be used to also verify a tag.
Junio C Hamano [Wed, 17 Jan 2007 09:08:30 +0000 (01:08 -0800)]
Documentation/git-tag: the command can be used to also verify a tag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocumentation/SubmittingPatches: Gnus tips
Junio C Hamano [Wed, 17 Jan 2007 09:07:27 +0000 (01:07 -0800)]
Documentation/SubmittingPatches: Gnus tips

Also warn about format=flowed (aka 'flawed').

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-commit: document log message formatting convention
Junio C Hamano [Wed, 17 Jan 2007 06:53:28 +0000 (22:53 -0800)]
git-commit: document log message formatting convention

Take it from the tutorial, since not everybody necessarily reads it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agocache.h; fix a couple of prototypes
Chris Wedgwood [Wed, 17 Jan 2007 06:28:02 +0000 (22:28 -0800)]
cache.h; fix a couple of prototypes

Trivial patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoDocument where configuration files are in config.txt
Junio C Hamano [Wed, 17 Jan 2007 06:45:35 +0000 (22:45 -0800)]
Document where configuration files are in config.txt

Talking about what the files contain without talking about where
they are does not help new users.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoUse merge-recursive in git-checkout -m (branch switching)
Junio C Hamano [Wed, 17 Jan 2007 04:46:39 +0000 (20:46 -0800)]
Use merge-recursive in git-checkout -m (branch switching)

This allows "git checkout -m <other-branch>" to notice renames and
carry local changes in the working tree forward.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agogit-commit documentation: remove comment on unfixed git-rm
Junio C Hamano [Wed, 17 Jan 2007 00:36:54 +0000 (16:36 -0800)]
git-commit documentation: remove comment on unfixed git-rm

... which was fixed since then.

Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agotutorial: shorthand for remotes but show distributed nature of git
Junio C Hamano [Wed, 17 Jan 2007 00:10:14 +0000 (01:10 +0100)]
tutorial: shorthand for remotes but show distributed nature of git

* Promiscous pull shows the distributed nature of git better.
* Add a new step after that to teach "remote add".
* Highlight that with the shorthand defined you will get
  remote tracking branches for free.
* Fix Alice's workflow.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agotutorial: Use only separate layout
Santi Béjar [Wed, 17 Jan 2007 00:09:12 +0000 (01:09 +0100)]
tutorial: Use only separate layout

Then the newbies only have to understand one layout.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
14 years agoFix spurious compile error
Johannes Schindelin [Tue, 16 Jan 2007 21:10:54 +0000 (22:10 +0100)]
Fix spurious compile error

From time to time, I would get this error:

[...]
sed: -e expression #8, char 41: Unterminated `s' command
make: *** [git-add--interactive] Error 1

Turns out that the function WriteMakefile() called in Makefile.PL
outputs the message "Writing perl.mak for Git" to stdout! Thus,
the output of "make -C perl -s --no-print-directory instlibdir"
would be prefixed by that message whenever Makefile.PL was newer
than perl.mak.

This is fixed by redirecting stdout to stderr in Makefile.PL.

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