git/git.git
13 years agoUse start_command() in git_connect() instead of explicit fork/exec.
Johannes Sixt [Fri, 19 Oct 2007 19:47:54 +0000 (21:47 +0200)]
Use start_command() in git_connect() instead of explicit fork/exec.

The child process handling is delegated to start_command() and
finish_command().

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoChange git_connect() to return a struct child_process instead of a pid_t.
Johannes Sixt [Fri, 19 Oct 2007 19:47:53 +0000 (21:47 +0200)]
Change git_connect() to return a struct child_process instead of a pid_t.

This prepares the API of git_connect() and finish_connect() to operate on
a struct child_process. Currently, we just use that object as a placeholder
for the pid that we used to return. A follow-up patch will change the
implementation of git_connect() and finish_connect() to make full use
of the object.

Old code had early-return-on-error checks at the calling sites of
git_connect(), but since git_connect() dies on errors anyway, these checks
were removed.

[sp: Corrected style nit of "conn == NULL" to "!conn"]

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoDefine compat version of mkdtemp for systems lacking it
Shawn O. Pearce [Sat, 20 Oct 2007 20:03:49 +0000 (16:03 -0400)]
Define compat version of mkdtemp for systems lacking it

Solaris 9 doesn't have mkdtemp() so we need to emulate it for the
rsync transport implementation.  Since Solaris 9 is lacking this
function we can also reasonably assume it is not available on
Solaris 8 either.  The new Makfile definition NO_MKDTEMP can be
set to enable the git compat version.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAvoid scary errors about tagged trees/blobs during git-fetch
Shawn O. Pearce [Fri, 19 Oct 2007 04:54:59 +0000 (00:54 -0400)]
Avoid scary errors about tagged trees/blobs during git-fetch

This is the same bug as 42a32174b600f139b489341b1281fb1bfa14c252.
The warning "Object $X is a tree, not a commit" is bogus and is
not relevant here.  If its not a commit we just need to make sure
we don't mark it for merge as we fill out FETCH_HEAD.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agofetch: if not fetching from default remote, ignore default merge
Johannes Schindelin [Thu, 11 Oct 2007 00:47:55 +0000 (01:47 +0100)]
fetch: if not fetching from default remote, ignore default merge

When doing "git fetch <remote>" on a remote that does not have the
branch referenced in branch.<current-branch>.merge, git fetch failed.
It failed because it tried to add the "merge" ref to the refs to be
fetched.

Fix that.  And add a test case.

Incidentally, this unconvered a bug in our own test suite, where
"git pull <some-path>" was expected to merge the ref given in the
defaults, even if not pulling from the default remote.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoSupport 'push --dry-run' for http transport
Shawn O. Pearce [Tue, 16 Oct 2007 04:35:22 +0000 (00:35 -0400)]
Support 'push --dry-run' for http transport

If the end-user requested a dry-run push we need to pass that flag
over to http-push and additionally make sure it does not actually
upload any changes to the remote server.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoSupport 'push --dry-run' for rsync transport
Shawn O. Pearce [Tue, 16 Oct 2007 04:28:32 +0000 (00:28 -0400)]
Support 'push --dry-run' for rsync transport

If the end-user requested a dry-run push we should pass that flag
though to rsync so that the rsync command can show what it would do
(or not do) if push was to be executed without the --dry-run flag.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix 'push --all branch...' error handling
Shawn O. Pearce [Tue, 16 Oct 2007 04:25:34 +0000 (00:25 -0400)]
Fix 'push --all branch...' error handling

The builtin-fetch topic changed push's handling of --all to setting
the new TRANSPORT_PUSH_ALL flag before starting the push subroutine
for the given transport.  Unfortunately not all references within
builtin-push were changed to test this flag therefore allowing push
to incorrectly accept refspecs and --all.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoMerge branch 'master' into db/fetch-pack
Shawn O. Pearce [Tue, 16 Oct 2007 04:15:25 +0000 (00:15 -0400)]
Merge branch 'master' into db/fetch-pack

There's a number of tricky conflicts between master and
this topic right now due to the rewrite of builtin-push.
Junio must have handled these via rerere; I'd rather not
deal with them again so I'm pre-merging master into the
topic.  Besides this topic somehow started to depend on
the strbuf series that was in next, but is now in master.
It no longer compiles on its own without the strbuf API.

* master: (184 commits)
  Whip post 1.5.3.4 maintenance series into shape.
  Minor usage update in setgitperms.perl
  manual: use 'URL' instead of 'url'.
  manual: add some markup.
  manual: Fix example finding commits referencing given content.
  Fix wording in push definition.
  Fix some typos, punctuation, missing words, minor markup.
  manual: Fix or remove em dashes.
  Add a --dry-run option to git-push.
  Add a --dry-run option to git-send-pack.
  Fix in-place editing functions in convert.c
  instaweb: support for Ruby's WEBrick server
  instaweb: allow for use of auto-generated scripts
  Add 'git-p4 commit' as an alias for 'git-p4 submit'
  hg-to-git speedup through selectable repack intervals
  git-svn: respect Subversion's [auth] section configuration values
  gtksourceview2 support for gitview
  fix contrib/hooks/post-receive-email hooks.recipients error message
  Support cvs via git-shell
  rebase -i: use diff plumbing instead of porcelain
  ...

Conflicts:

Makefile
builtin-push.c
rsh.c

13 years agoMerge branch 'maint'
Shawn O. Pearce [Tue, 16 Oct 2007 02:31:47 +0000 (22:31 -0400)]
Merge branch 'maint'

* maint:
  Whip post 1.5.3.4 maintenance series into shape.
  rebase -i: use diff plumbing instead of porcelain
  Do not remove distributed configure script
  git-archive: document --exec
  git-reflog: document --verbose
  git-config: handle --file option with relative pathname properly
  clear_commit_marks(): avoid deep recursion
  git add -i: Remove unused variables
  git add -i: Fix parsing of abbreviated hunk headers
  git-config: don't silently ignore options after --list
  Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
  Fix embarrassing "git log --follow" bug

Conflicts:

RelNotes
git-rebase--interactive.sh

13 years agoWhip post 1.5.3.4 maintenance series into shape.
Shawn O. Pearce [Tue, 16 Oct 2007 02:29:50 +0000 (22:29 -0400)]
Whip post 1.5.3.4 maintenance series into shape.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoMinor usage update in setgitperms.perl
Josh England [Tue, 9 Oct 2007 16:04:42 +0000 (10:04 -0600)]
Minor usage update in setgitperms.perl

Signed-off-by: Josh England <jjengla@sandia.gov>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agomanual: use 'URL' instead of 'url'.
Ralf Wildenhues [Tue, 9 Oct 2007 21:03:55 +0000 (23:03 +0200)]
manual: use 'URL' instead of 'url'.

Just for consistency, use the spelling URL everywhere.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agomanual: add some markup.
Ralf Wildenhues [Tue, 9 Oct 2007 21:03:11 +0000 (23:03 +0200)]
manual: add some markup.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agomanual: Fix example finding commits referencing given content.
Ralf Wildenhues [Tue, 9 Oct 2007 21:02:19 +0000 (23:02 +0200)]
manual: Fix example finding commits referencing given content.

If I'm handed a file, then it typically lives outside the
working directory.  git-log only operates on in-tree files,
so the first 'filename' should be an in-tree one, or it should
look at all files.  This patch does the latter, so it would
also find renamed files.  However, it is also slower.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix wording in push definition.
Ralf Wildenhues [Tue, 9 Oct 2007 21:01:05 +0000 (23:01 +0200)]
Fix wording in push definition.

Make the definition of push in the glossary readable.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix some typos, punctuation, missing words, minor markup.
Ralf Wildenhues [Tue, 9 Oct 2007 21:00:03 +0000 (23:00 +0200)]
Fix some typos, punctuation, missing words, minor markup.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agomanual: Fix or remove em dashes.
Ralf Wildenhues [Tue, 9 Oct 2007 21:05:30 +0000 (23:05 +0200)]
manual: Fix or remove em dashes.

em dashes were used inconsistently in the manual.
This changes them to the way they are used in US English.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAdd a --dry-run option to git-push.
Brian Ewins [Thu, 11 Oct 2007 19:32:27 +0000 (20:32 +0100)]
Add a --dry-run option to git-push.

The default behaviour of git-push is potentially confusing
for new users, since it will push changes that are not on
the current branch. Publishing patches that were still
cooking on a development branch is hard to undo.

It would also be nice to be able to verify the expansion
of refspecs if you've edited them, so that you know
what branches matched on the server.

Adding a --dry-run flag allows the user to experiment
safely and learn how to use git-push properly. Originally
suggested by Steffen Prohaska.

Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAdd a --dry-run option to git-send-pack.
Brian Ewins [Thu, 11 Oct 2007 19:32:26 +0000 (20:32 +0100)]
Add a --dry-run option to git-send-pack.

Implement support for --dry-run, so that it can be used
in calls from git-push. With this flag set, git-send-pack
will not send any updates to the server.

Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix compilation when NO_CURL is defined
Johannes Schindelin [Mon, 15 Oct 2007 13:52:25 +0000 (14:52 +0100)]
Fix compilation when NO_CURL is defined

There were a few places which did not cope well without curl.  This
fixes all of them.  We still need to link against the walker.o part
of the library as some parts of transport.o still call into there
even though we don't have HTTP support enabled.

If compiled with NO_CURL=1 we now get the following useful error
message:

  $ git-fetch http://www.example.com/git
  error: git was compiled without libcurl support.
  fatal: Don't know how to fetch from http://www.example.com/git

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix in-place editing functions in convert.c
Pierre Habouzit [Fri, 5 Oct 2007 08:11:59 +0000 (10:11 +0200)]
Fix in-place editing functions in convert.c

* crlf_to_git and ident_to_git:

  Don't grow the buffer if there is enough space in the first place.
  As a side effect, when the editing is done "in place", we don't grow, so
  the buffer pointer doesn't changes, and `src' isn't invalidated anymore.

  Thanks to Bernt Hansen for the bug report.

* apply_filter:

  Fix memory leak due to fake in-place editing that didn't collected the
  old buffer when the filter succeeds. Also a cosmetic fix.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoinstaweb: support for Ruby's WEBrick server
Mike Dalessio [Sat, 6 Oct 2007 17:29:49 +0000 (13:29 -0400)]
instaweb: support for Ruby's WEBrick server

running the webrick server with git requires Ruby and Ruby's YAML and
Webrick libraries (both of which come standard with Ruby). nice for
single-user standalone invocations.

the --httpd=webrick option generates a ruby script on the fly to read
httpd.conf options and invoke the web server via library call. this
script is placed in the .git/gitweb directory. it also generates a
shell script in a feeble attempt to invoke ruby in a portable manner,
which assumes that 'ruby' is in the user's $PATH.

Signed-off-by: Mike Dalessio <mike@csa.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoinstaweb: allow for use of auto-generated scripts
Mike Dalessio [Sat, 6 Oct 2007 17:29:48 +0000 (13:29 -0400)]
instaweb: allow for use of auto-generated scripts

this patch allows scripts that reside in $fqgitdir/gitweb to be used
for firing up an instaweb server. this lays the groundwork for
extending instaweb support to non-standard web servers, which may
require a script for proper invocation.

Signed-off-by: Mike Dalessio <mike@csa.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAdd 'git-p4 commit' as an alias for 'git-p4 submit'
Marius Storm-Olsen [Tue, 9 Oct 2007 14:16:09 +0000 (16:16 +0200)]
Add 'git-p4 commit' as an alias for 'git-p4 submit'

Given that git uses 'commit', git-p4's 'sumbit' was a bit confusing at times;
often making me do 'git submit' and 'git-p4 commit' instead.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Acked-By: Simon Hausmann <simon@lst.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agohg-to-git speedup through selectable repack intervals
Michael Gebetsroither [Sat, 6 Oct 2007 21:16:51 +0000 (23:16 +0200)]
hg-to-git speedup through selectable repack intervals

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-svn: respect Subversion's [auth] section configuration values
Eygene Ryabinkin [Sat, 6 Oct 2007 18:57:19 +0000 (22:57 +0400)]
git-svn: respect Subversion's [auth] section configuration values

Parameters 'store-passwords' and 'store-auth-creds' from Subversion's
configuration (~/.subversion/config) were not respected.  This was
fixed: the default values for these parameters are set to 'yes' to
follow Subversion behaviour.

Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogtksourceview2 support for gitview
Frederick Akalin [Fri, 5 Oct 2007 07:20:49 +0000 (00:20 -0700)]
gtksourceview2 support for gitview

Added support for gtksourceview2 module (pygtksourceview 1.90.x) in
gitview.  Also refactored code that creates the source buffer and view.

Signed-off-by: Frederick Akalin <akalin@akalin.cx>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agofix contrib/hooks/post-receive-email hooks.recipients error message
Jeff Muizelaar [Thu, 11 Oct 2007 21:49:21 +0000 (17:49 -0400)]
fix contrib/hooks/post-receive-email hooks.recipients error message

Have the error message for missing recipients actually report the
missing config variable and not a fictional one.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoSupport cvs via git-shell
Johannes Schindelin [Tue, 9 Oct 2007 14:33:25 +0000 (15:33 +0100)]
Support cvs via git-shell

This adds cvs support to the git-shell; You can now give new users
a restricted git-shell and they still can commit via git's cvs
emulator.

Note that either the gecos information must be accurate, or you must
provide a $HOME/.gitconfig with the appropriate user credentials.
Since the git-shell is too restricted to allow the user to do it
(on purpose!), it is up to the administrator to take care of that.

Based on an idea by Jan Wielemaker.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agorebase -i: use diff plumbing instead of porcelain
Johannes Schindelin [Tue, 9 Oct 2007 12:59:43 +0000 (13:59 +0100)]
rebase -i: use diff plumbing instead of porcelain

When diff drivers are installed, calling "git diff <tree1>..<tree2>"
calls those drivers.  This borks the patch generation of rebase -i.
So use "git diff-tree -p" instead, which does not call diff drivers.

Noticed by Johannes Sixt.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoDo not remove distributed configure script
Mathias Megyei [Thu, 4 Oct 2007 21:49:19 +0000 (23:49 +0200)]
Do not remove distributed configure script

Before this patch the clean target has removed the
configure script that comes with Git tar file.
That made compiling Git for different architectures
inconvenient.
This patch excludes configure from the files to be
deleted by 'make clean' and adds new target 'distclean'
to preserve old functionality.

Signed-off-by: Mathias Megyei <mathias@mnet-mail.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-archive: document --exec
Michele Ballabio [Thu, 4 Oct 2007 22:41:11 +0000 (00:41 +0200)]
git-archive: document --exec

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-reflog: document --verbose
Michele Ballabio [Thu, 4 Oct 2007 12:26:54 +0000 (14:26 +0200)]
git-reflog: document --verbose

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agomakefile: Add a cscope target
Kristof Provost [Sat, 6 Oct 2007 14:24:42 +0000 (16:24 +0200)]
makefile: Add a cscope target

The current makefile supports ctags but not cscope. Some people prefer
cscope (I do), so this patch adds a cscope target.

I've also added cscope* to the .gitignore file. For some reason tags
and TAGS weren't in there either so I've added them too.

Signed-off-by: Kristof Provost <Kristof@provost-engineering.be>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-config: handle --file option with relative pathname properly
Gerrit Pape [Fri, 12 Oct 2007 11:32:51 +0000 (11:32 +0000)]
git-config: handle --file option with relative pathname properly

When calling git-config not from the top level directory of a repository,
it changes directory before trying to open the config file specified
through the --file option, which then fails if the config file was
specified by a relative pathname.  This patch adjusts the pathname to
the config file if applicable.

The problem was noticed by Joey Hess, reported through
 http://bugs.debian.org/445208

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoclear_commit_marks(): avoid deep recursion
Johannes Schindelin [Wed, 10 Oct 2007 22:14:35 +0000 (23:14 +0100)]
clear_commit_marks(): avoid deep recursion

Before this patch, clear_commit_marks() recursed for each parent.  This
could be potentially very expensive in terms of stack space.  Probably
the only reason that this did not lead to problems is the fact that we
typically call clear_commit_marks() after marking a relatively small set
of commits.

Use (sort of) a tail recursion instead: first recurse on the parents
other than the first one, and then continue the loop with the first
parent.

Noticed by Shawn Pearce.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit add -i: Remove unused variables
Jean-Luc Herren [Tue, 9 Oct 2007 19:34:17 +0000 (21:34 +0200)]
git add -i: Remove unused variables

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit add -i: Fix parsing of abbreviated hunk headers
Jean-Luc Herren [Tue, 9 Oct 2007 19:29:26 +0000 (21:29 +0200)]
git add -i: Fix parsing of abbreviated hunk headers

The unified diff format allows one-line ranges to be abbreviated
by omiting the size.  The hunk header "@@ -10,1 +10,1 @@" can be
expressed as "@@ -10 +10 @@", but this wasn't properly parsed in
all cases.

Such abbreviated hunk headers are generated when a one-line change
(add, remove or modify) appears without context; for example
because the file is a one-liner itself or because GIT_DIFF_OPTS
was set to '-u0'.  If the user then runs 'git add -i' and enters
the 'patch' command for that file, perl complains about undefined
variables.

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-config: don't silently ignore options after --list
Frank Lichtenheld [Fri, 5 Oct 2007 20:16:44 +0000 (22:16 +0200)]
git-config: don't silently ignore options after --list

Error out if someone gives options after --list since that is
not a valid syntax.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gc --auto: simplify "repack" command line building
Brandon Casey [Thu, 11 Oct 2007 01:00:27 +0000 (20:00 -0500)]
git-gc --auto: simplify "repack" command line building

Since "-a" is removed from the base repack command line,
we can simplify how we add additional options to this
command line when using --auto.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agogit-gc: by default use safer "-A" option to repack when not --prune'ing
Brandon Casey [Thu, 11 Oct 2007 00:59:19 +0000 (19:59 -0500)]
git-gc: by default use safer "-A" option to repack when not --prune'ing

This makes use of repack's new "-A" option which does not drop packed
unreachable objects. This makes git-gc safe to call at any time,
particularly when a repository is referenced as an alternate by
another repository.

git-gc --prune will use the "-a" option to repack instead of "-A", so
that packed unreachable objects will be removed.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoAdded a test for fetching remote tags when there is not tags.
Väinö Järvelä [Tue, 9 Oct 2007 08:51:07 +0000 (11:51 +0300)]
Added a test for fetching remote tags when there is not tags.

When a user runs "git fetch -t", git crashes when it doesn't find any
tags on the remote repository.

Signed-off-by: Väinö Järvelä <v@pp.inet.fi>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix a crash in ls-remote when refspec expands into nothing
Alex Riesen [Fri, 12 Oct 2007 20:40:04 +0000 (22:40 +0200)]
Fix a crash in ls-remote when refspec expands into nothing

Originally-by: Väinö Järvelä <v@pp.inet.fi>
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoRemove duplicate ref matches in fetch
Daniel Barkalow [Mon, 8 Oct 2007 04:25:07 +0000 (00:25 -0400)]
Remove duplicate ref matches in fetch

If multiple refspecs matched the same ref, the update would be
processed multiple times. Now having the same destination for the same
source has no additional effect, and having the same destination for
different sources is an error.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agofix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="
Alex Riesen [Thu, 4 Oct 2007 13:32:53 +0000 (15:32 +0200)]
fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoClean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Linus Torvalds [Tue, 9 Oct 2007 16:35:22 +0000 (09:35 -0700)]
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT

This fixes an unnecessary empty line that we add to the log message when
we generate diffs, but don't actually end up printing any due to having
DIFF_FORMAT_NO_OUTPUT set.

This can happen with pickaxe or with rename following. The reason is that
we normally add an empty line between the commit and the diff, but we do
that even for the case where we've then suppressed the actual printing of
the diff.

This also updates a couple of tests that assumed the extraneous empty
line would exist at the end of output.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoFix embarrassing "git log --follow" bug
Linus Torvalds [Mon, 8 Oct 2007 20:42:41 +0000 (13:42 -0700)]
Fix embarrassing "git log --follow" bug

It turns out that I completely broke "git log --follow" with my recent
patch to revision.c ("Fix revision log diff setup, avoid unnecessary diff
generation", commit b7bb760d5ed4881422673d32f869d140221d3564).

Why? Because --follow obviously requires the diff machinery to function,
exactly the same way pickaxe does.

So everybody is away right now, but considering that nobody even noticed
this bug, I don't think it matters. But for the record, here's the trivial
one-liner fix (well, two, since I also fixed the comment).

Because of the nature of the bug, if you ask for patches when following
(which is one of the things I normally do), the bug is hidden, because
then the request for diff output will automatically also enable the diffs
themselves.

So while "git log --follow <filename>" didn't work, adding a "-p"
magically made it work again even without this fix.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years agoUpdate state documentation link for 1.5.3.4
Junio C Hamano [Thu, 4 Oct 2007 08:35:01 +0000 (01:35 -0700)]
Update state documentation link for 1.5.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoDon't checkout the full tree if avoidable
Steven Walter [Fri, 28 Sep 2007 17:24:19 +0000 (13:24 -0400)]
Don't checkout the full tree if avoidable

In most cases of branching, the tree is copied unmodified from the trunk
to the branch.  When that is done, we can simply start with the parent's
index and apply the changes on the branch as usual.

[ew: rewritten from Steven's original to use SVN::Client instead
     of the command-line svn client.

     Since SVN::Client connects separately, we'll share our
     authentication providers array between our usages of
     SVN::Client and SVN::Ra, too.  Bypassing the high-level
     SVN::Client library can avoid this, but the code will be
     much more complex.  Regardless, any implementation of this
     seems to require restarting a connection to the remote
     server.

     Also of note is that SVN 1.4 and later allows a more
     efficient diff_summary to be done instead of a full diff,
     but since this code is only to support SVN < 1.4.4, we'll
     ignore it for now.]

Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobuiltin-apply: fix conversion error in strbuf series
Junio C Hamano [Thu, 4 Oct 2007 00:42:52 +0000 (17:42 -0700)]
builtin-apply: fix conversion error in strbuf series

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'mv/unknown'
Junio C Hamano [Wed, 3 Oct 2007 11:28:24 +0000 (04:28 -0700)]
Merge branch 'mv/unknown'

* mv/unknown:
  Don't use "<unknown>" for placeholders and suppress printing of empty user formats.

13 years agoMerge branch 'ph/strbuf'
Junio C Hamano [Wed, 3 Oct 2007 10:06:02 +0000 (03:06 -0700)]
Merge branch 'ph/strbuf'

* ph/strbuf: (44 commits)
  Make read_patch_file work on a strbuf.
  strbuf_read_file enhancement, and use it.
  strbuf change: be sure ->buf is never ever NULL.
  double free in builtin-update-index.c
  Clean up stripspace a bit, use strbuf even more.
  Add strbuf_read_file().
  rerere: Fix use of an empty strbuf.buf
  Small cache_tree_write refactor.
  Make builtin-rerere use of strbuf nicer and more efficient.
  Add strbuf_cmp.
  strbuf_setlen(): do not barf on setting length of an empty buffer to 0
  sq_quote_argv and add_to_string rework with strbuf's.
  Full rework of quote_c_style and write_name_quoted.
  Rework unquote_c_style to work on a strbuf.
  strbuf API additions and enhancements.
  nfv?asprintf are broken without va_copy, workaround them.
  Fix the expansion pattern of the pseudo-static path buffer.
  builtin-for-each-ref.c::copy_name() - do not overstep the buffer.
  builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.
  Use xmemdupz() in many places.
  ...

13 years agoMerge branch 'lh/merge'
Junio C Hamano [Wed, 3 Oct 2007 10:05:58 +0000 (03:05 -0700)]
Merge branch 'lh/merge'

* lh/merge:
  git-merge: add --ff and --no-ff options
  git-merge: add support for --commit and --no-squash
  git-merge: add support for branch.<name>.mergeoptions
  git-merge: refactor option parsing
  git-merge: fix faulty SQUASH_MSG
  Add test-script for git-merge porcelain

13 years agoMerge branch 'js/rebase-i'
Junio C Hamano [Wed, 3 Oct 2007 10:05:39 +0000 (03:05 -0700)]
Merge branch 'js/rebase-i'

* js/rebase-i:
  rebase -i: work on a detached HEAD

13 years agoMerge branch 'jc/autogc'
Junio C Hamano [Wed, 3 Oct 2007 10:05:32 +0000 (03:05 -0700)]
Merge branch 'jc/autogc'

* jc/autogc:
  git-gc --auto: run "repack -A -d -l" as necessary.
  git-gc --auto: restructure the way "repack" command line is built.
  git-gc --auto: protect ourselves from accumulated cruft
  git-gc --auto: add documentation.
  git-gc --auto: move threshold check to need_to_gc() function.
  repack -A -d: use --keep-unreachable when repacking
  pack-objects --keep-unreachable
  Export matches_pack_name() and fix its return value
  Invoke "git gc --auto" from commit, merge, am and rebase.
  Implement git gc --auto

13 years agoMerge branch 'je/hooks'
Junio C Hamano [Wed, 3 Oct 2007 10:03:40 +0000 (03:03 -0700)]
Merge branch 'je/hooks'

* je/hooks:
  post-checkout hook, tests, and docs

13 years agoMerge branch 'ap/dateformat'
Junio C Hamano [Wed, 3 Oct 2007 10:03:22 +0000 (03:03 -0700)]
Merge branch 'ap/dateformat'

* ap/dateformat:
  Add a test script for for-each-ref, including test of date formatting
  dateformat: parse %(xxdate) %(yydate:format) correctly
  Make for-each-ref's grab_date() support per-atom formatting
  Make for-each-ref allow atom names like "<name>:<something>"
  parse_date_format(): convert a format name to an enum date_mode

13 years agoSync with GIT 1.5.3.4
Junio C Hamano [Wed, 3 Oct 2007 10:03:15 +0000 (03:03 -0700)]
Sync with GIT 1.5.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoGIT 1.5.3.4 v1.5.3.4
Junio C Hamano [Wed, 3 Oct 2007 09:33:11 +0000 (02:33 -0700)]
GIT 1.5.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd a test script for for-each-ref, including test of date formatting
Andy Parkins [Tue, 2 Oct 2007 11:02:57 +0000 (12:02 +0100)]
Add a test script for for-each-ref, including test of date formatting

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd test case for ls-files --with-tree
Carl Worth [Wed, 3 Oct 2007 07:03:53 +0000 (00:03 -0700)]
Add test case for ls-files --with-tree

This tests basic functionality and also exercises a bug noticed
by Keith Packard, (prune_cache followed by add_index_entry can
trigger an attempt to realloc a pointer into the middle of an
allocated buffer).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMust not modify the_index.cache as it may be passed to realloc at some point.
Keith Packard [Wed, 3 Oct 2007 05:44:15 +0000 (22:44 -0700)]
Must not modify the_index.cache as it may be passed to realloc at some point.

The index cache is not static, growing as new entries are added. If
entries are added after prune_cache is called, cache will no longer
point at the base of the allocation, and realloc will not be happy.

I verified that this was the only place in the current source which
modified any index_state.cache elements aside from the alloc/realloc
calls in read-cache by changing the type of the element to 'struct
cache_entry ** const cache' and recompiling.

A more efficient patch would create a separate 'cache_base' value to
track the allocation and then fix things up when reallocation was
necessary, instead of the brute-force memmove used here.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoRestore default verbosity for http fetches.
Daniel Barkalow [Wed, 3 Oct 2007 02:49:15 +0000 (22:49 -0400)]
Restore default verbosity for http fetches.

This adds a verbosity level below 0 for suppressing default messages
with --quiet, and makes the default for http be verbose instead of
quiet. This matches the behavior of the shell script version of git-fetch.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agothe ar tool is called gar on some systems
Robert Schiele [Wed, 3 Oct 2007 01:49:34 +0000 (03:49 +0200)]
the ar tool is called gar on some systems

Some systems that have only installed the GNU toolchain (prefixed with "g")
do not provide "ar" but only "gar".  Make configure find this tool as well.

Signed-off-by: Robert Schiele <rschiele@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agorename diff_free_filespec_data_large() to diff_free_filespec_blob()
Junio C Hamano [Wed, 3 Oct 2007 04:01:03 +0000 (21:01 -0700)]
rename diff_free_filespec_data_large() to diff_free_filespec_blob()

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodiffcore-rename: cache file deltas
Jeff King [Tue, 25 Sep 2007 19:29:42 +0000 (15:29 -0400)]
diffcore-rename: cache file deltas

We find rename candidates by computing a fingerprint hash of
each file, and then comparing those fingerprints. There are
inherently O(n^2) comparisons, so it pays in CPU time to
hoist the (rather expensive) computation of the fingerprint
out of that loop (or to cache it once we have computed it once).

Previously, we didn't keep the filespec information around
because then we had the potential to consume a great deal of
memory. However, instead of keeping all of the filespec
data, we can instead just keep the fingerprint.

This patch implements and uses diff_free_filespec_data_large
to accomplish that goal. We also have to change
estimate_similarity not to needlessly repopulate the
filespec data when we already have the hash.

Practical tests showed 4.5x speedup for a 10% memory usage
increase.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMention 'cpio' dependency in INSTALL
Johan Herland [Tue, 2 Oct 2007 23:42:29 +0000 (01:42 +0200)]
Mention 'cpio' dependency in INSTALL

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMake git-pull complain and give advice when there is nothing to merge with
Federico Mena Quintero [Tue, 2 Oct 2007 23:36:30 +0000 (18:36 -0500)]
Make git-pull complain and give advice when there is nothing to merge with

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoNote that git-branch will not automatically checkout the new branch
Federico Mena Quintero [Tue, 2 Oct 2007 23:34:32 +0000 (18:34 -0500)]
Note that git-branch will not automatically checkout the new branch

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAdd documentation for --track and --no-track to the git-branch docs.
Federico Mena Quintero [Tue, 2 Oct 2007 23:33:30 +0000 (18:33 -0500)]
Add documentation for --track and --no-track to the git-branch docs.

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoSay when --track is useful in the git-checkout docs.
Federico Mena Quintero [Tue, 2 Oct 2007 23:32:32 +0000 (18:32 -0500)]
Say when --track is useful in the git-checkout docs.

The documentation used to say what the option does, but it
didn't mention a use case.

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix typo in config.txt
Johannes Schindelin [Tue, 2 Oct 2007 20:14:30 +0000 (21:14 +0100)]
Fix typo in config.txt

There was an 'l' (ell) instead of a '1' (one) in one of the gitlinks.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofor-each-ref: fix %(numparent) and %(parent)
Junio C Hamano [Tue, 2 Oct 2007 22:09:41 +0000 (15:09 -0700)]
for-each-ref: fix %(numparent) and %(parent)

The string value of %(numparent) was not returned correctly.
Also %(parent) misbehaved for the root commits (returned garbage)
and merge commits (returned first parent, followed by a space).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agodateformat: parse %(xxdate) %(yydate:format) correctly
Junio C Hamano [Tue, 2 Oct 2007 21:31:37 +0000 (14:31 -0700)]
dateformat: parse %(xxdate) %(yydate:format) correctly

Andy Parkins noticed that parsing of the above would not
correctly notice that xxdate does not have any format
specifier.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-commit: initialize TMP_INDEX just to be sure.
Junio C Hamano [Tue, 2 Oct 2007 18:47:58 +0000 (11:47 -0700)]
git-commit: initialize TMP_INDEX just to be sure.

We rely on TMP_INDEX variable to decide if we are doing a partial commit,
as it is only set in the partial commit codepath.  But the variable is
never initialized.  A stray environment variable from outside could
ruin the day.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofixed link in documentation of diff-options
Steffen Prohaska [Tue, 2 Oct 2007 06:14:37 +0000 (08:14 +0200)]
fixed link in documentation of diff-options

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agofetch/push: readd rsync support
Johannes Schindelin [Sun, 30 Sep 2007 23:59:39 +0000 (00:59 +0100)]
fetch/push: readd rsync support

We lost rsync support when transitioning from shell to C.  Support it
again (even if the transport is technically deprecated, some people just
do not have any chance to use anything else).

Also, add a test to t5510.  Since rsync transport is not configured by
default on most machines, and especially not such that you can write to
rsync://127.0.0.1$(pwd)/, it is disabled by default; you can enable it by
setting the environment variable TEST_RSYNC.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint'
Junio C Hamano [Mon, 1 Oct 2007 09:09:09 +0000 (02:09 -0700)]
Merge branch 'maint'

* maint:
  Whip post 1.5.3.3 maintenance series into shape.
  git stash: document apply's --index switch
  post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used

13 years agoWhip post 1.5.3.3 maintenance series into shape.
Junio C Hamano [Mon, 1 Oct 2007 09:07:47 +0000 (02:07 -0700)]
Whip post 1.5.3.3 maintenance series into shape.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit stash: document apply's --index switch
Miklos Vajna [Sun, 30 Sep 2007 22:30:27 +0000 (00:30 +0200)]
git stash: document apply's --index switch

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agopost-receive-hook: Remove the From field from the generated email header so that...
Andy Parkins [Fri, 28 Sep 2007 14:24:26 +0000 (15:24 +0100)]
post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used

Using the name of the committer of the revision at the tip of the
updated ref is not sensible.  That information is available in the email
itself should it be wanted, and by supplying a "From", we were
effectively hiding the person who performed the push - which is useful
information in itself.

Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoUpdate stale documentation link in the k.org site
Junio C Hamano [Mon, 1 Oct 2007 00:32:25 +0000 (17:32 -0700)]
Update stale documentation link in the k.org site

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoIntroduce remove_dir_recursively()
Johannes Schindelin [Fri, 28 Sep 2007 15:28:54 +0000 (16:28 +0100)]
Introduce remove_dir_recursively()

There was a function called remove_empty_dir_recursive() buried
in refs.c.  Expose a slightly enhanced version in dir.h: it can now
optionally remove a non-empty directory.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agobundle transport: fix an alloc_ref() call
Junio C Hamano [Fri, 28 Sep 2007 08:46:13 +0000 (01:46 -0700)]
bundle transport: fix an alloc_ref() call

Currently alloc_ref() expects the length of the refname plus 1
as its parameter, prepares that much space and returns a "ref"
structure for the caller to fill the refname.  One caller in
transport.c::get_refs_from_bundle() however allocated one byte
less.

It may be a good idea to change the calling convention to give
alloc_ref() the length of the refname, but that clean-up can be
done in a separate patch.  This patch only fixes the bug and
makes all callers consistent.

There was also one overallocation in connect.c, which would not
hurt but was wasteful.  This patch fixes it as well.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit.el: Reset the permission flags when changing a file state.
Alexandre Julliard [Sat, 29 Sep 2007 09:59:32 +0000 (11:59 +0200)]
git.el: Reset the permission flags when changing a file state.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit.el: Update a file status in the git buffer upon save.
Alexandre Julliard [Sat, 29 Sep 2007 09:59:07 +0000 (11:59 +0200)]
git.el: Update a file status in the git buffer upon save.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit.el: Do not print a status message on every git command.
Alexandre Julliard [Sat, 29 Sep 2007 09:58:39 +0000 (11:58 +0200)]
git.el: Do not print a status message on every git command.

Instead print a single message around sequences of commands that can
potentially take some time.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit.el: Preserve file marks when doing a full refresh.
Alexandre Julliard [Sat, 29 Sep 2007 09:58:08 +0000 (11:58 +0200)]
git.el: Preserve file marks when doing a full refresh.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoFix adding a submodule with a remote url
Daniel Barkalow [Sat, 29 Sep 2007 23:39:54 +0000 (19:39 -0400)]
Fix adding a submodule with a remote url

Without this, a non-path URL gets lost before the clone.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-remote: exit with non-zero status after detecting error in "rm".
Jari Aalto [Sun, 30 Sep 2007 06:34:19 +0000 (23:34 -0700)]
git-remote: exit with non-zero status after detecting error in "rm".

Exit with non-zero status when "git remote rm" was told to
remove a non-existing remote.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMerge branch 'maint'
Junio C Hamano [Sun, 30 Sep 2007 06:32:36 +0000 (23:32 -0700)]
Merge branch 'maint'

* maint:
  git-remote: exit with non-zero status after detecting errors.
  rebase -i: squash should retain the authorship of the _first_ commit
  git-add--interactive: Improve behavior on bogus input
  git-add--interactive: Allow Ctrl-D to exit

13 years agogit-remote: exit with non-zero status after detecting errors.
Jari Aalto [Sun, 30 Sep 2007 06:29:43 +0000 (23:29 -0700)]
git-remote: exit with non-zero status after detecting errors.

Some subcommands of "git-remote" detected and issued error
messages but did not signal that to the calling process with
exit status.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agorebase -i: squash should retain the authorship of the _first_ commit
Johannes Schindelin [Sat, 29 Sep 2007 23:34:23 +0000 (00:34 +0100)]
rebase -i: squash should retain the authorship of the _first_ commit

It was determined on the mailing list, that it makes more sense for a
"squash" to keep the author of the first commit as the author for the
result of the squash.

Make it so.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agorebase -i: support single-letter abbreviations for the actions
Johannes Schindelin [Sat, 29 Sep 2007 02:32:11 +0000 (03:32 +0100)]
rebase -i: support single-letter abbreviations for the actions

When you do many rebases, you can get annoyed by having to type out
the actions "edit" or "squash" in total.

This commit helps that, by allowing you to enter "e" instead of "edit",
"p" instead of "pick", or "s" instead of "squash".

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-add--interactive: Improve behavior on bogus input
Jean-Luc Herren [Wed, 26 Sep 2007 14:05:01 +0000 (16:05 +0200)]
git-add--interactive: Improve behavior on bogus input

1) Previously, any menu would cause a perl error when entered '0',
   which is never a valid option.

2) Entering a bogus choice (like 998 or 4-2) surprisingly caused
   the same behavior as if the user had just hit 'enter', which
   means to carry out the selected action on the selected items.
   Entering such bogus input is now a no-op and the sub-menu
   doesn't exit.

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agogit-add--interactive: Allow Ctrl-D to exit
Jean-Luc Herren [Wed, 26 Sep 2007 13:56:19 +0000 (15:56 +0200)]
git-add--interactive: Allow Ctrl-D to exit

Hitting Ctrl-D (EOF) is a common way to exit shell-like tools.
When in a sub-menu it will still behave as if an empty line had
been entered, carrying out the action on the selected items and
returning to the previous menu.

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoAllow abbreviations in the first refspec to be merged
Daniel Barkalow [Fri, 28 Sep 2007 23:34:17 +0000 (19:34 -0400)]
Allow abbreviations in the first refspec to be merged

The config item for a refspec side and the ref name that it matches
aren't necessarily character-for-character identical. We actually want
to merge a ref by default if: there is no per-branch config, it is the
found result of looking for the match for the first refspec, and the
first refspec is not a pattern. Beyond that, anything that
get_fetch_map() thinks matches is fine.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agoMake read_patch_file work on a strbuf.
Pierre Habouzit [Thu, 27 Sep 2007 11:33:19 +0000 (13:33 +0200)]
Make read_patch_file work on a strbuf.

So that we don't need to use strbuf_detach.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years agostrbuf_read_file enhancement, and use it.
Pierre Habouzit [Thu, 27 Sep 2007 13:25:55 +0000 (15:25 +0200)]
strbuf_read_file enhancement, and use it.

* make strbuf_read_file take a size hint (works like strbuf_read)
* use it in a couple of places.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>