git/git.git
12 years agoMerge branch 'jc/add-n-u'
Junio C Hamano [Sun, 25 May 2008 21:03:50 +0000 (14:03 -0700)]
Merge branch 'jc/add-n-u'

* jc/add-n-u:
  Make git add -n and git -u -n output consistent
  "git-add -n -u" should not add but just report

Conflicts:

builtin-add.c
builtin-mv.c
cache.h
read-cache.c

12 years agoMerge branch 'ar/t6031'
Junio C Hamano [Sun, 25 May 2008 20:49:16 +0000 (13:49 -0700)]
Merge branch 'ar/t6031'

* ar/t6031:
  Fix t6031 on filesystems without working exec bit

12 years agoMerge branch 'db/clone-in-c'
Junio C Hamano [Sun, 25 May 2008 20:38:44 +0000 (13:38 -0700)]
Merge branch 'db/clone-in-c'

* db/clone-in-c:
  Add test for cloning with "--reference" repo being a subset of source repo
  Add a test for another combination of --reference
  Test that --reference actually suppresses fetching referenced objects
  clone: fall back to copying if hardlinking fails
  builtin-clone.c: Need to closedir() in copy_or_link_directory()
  builtin-clone: fix initial checkout
  Build in clone
  Provide API access to init_db()
  Add a function to set a non-default work tree
  Allow for having for_each_ref() list extra refs
  Have a constant extern refspec for "--tags"
  Add a library function to add an alternate to the alternates file
  Add a lockfile function to append to a file
  Mark the list of refs to fetch as const

Conflicts:

cache.h
t/t5700-clone-reference.sh

12 years agoMerge branch 'jc/apply-whitespace'
Junio C Hamano [Sun, 25 May 2008 20:38:31 +0000 (13:38 -0700)]
Merge branch 'jc/apply-whitespace'

* jc/apply-whitespace:
  builtin-apply: do not declare patch is creation when we do not know it
  builtin-apply: accept patch to an empty file
  builtin-apply: typofix

12 years agoMerge branch 'jc/unpack-trees-reword'
Junio C Hamano [Sun, 25 May 2008 20:38:27 +0000 (13:38 -0700)]
Merge branch 'jc/unpack-trees-reword'

* jc/unpack-trees-reword:
  unpack-trees: allow Porcelain to give different error messages

12 years agoMerge branch 'ar/batch-cat'
Junio C Hamano [Sun, 25 May 2008 20:38:06 +0000 (13:38 -0700)]
Merge branch 'ar/batch-cat'

* ar/batch-cat:
  change quoting in test t1006-cat-file.sh
  builtin-cat-file.c: use parse_options()
  git-svn: Speed up fetch
  Git.pm: Add hash_and_insert_object and cat_blob
  Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
  git-hash-object: Add --stdin-paths option
  Add more tests for git hash-object
  Move git-hash-object tests from t5303 to t1007
  git-cat-file: Add --batch option
  git-cat-file: Add --batch-check option
  git-cat-file: Make option parsing a little more flexible
  git-cat-file: Small refactor of cmd_cat_file
  Add tests for git cat-file

12 years agoMerge branch 'cc/bisect'
Junio C Hamano [Sun, 25 May 2008 20:38:03 +0000 (13:38 -0700)]
Merge branch 'cc/bisect'

* cc/bisect:
  bisect: use a detached HEAD to bisect
  bisect: trap critical errors in "bisect_start"
  bisect: fix left over "BISECT_START" file when starting with junk rev
  bisect: add test cases to check that "git bisect start" is atomic

12 years agoMerge branch 'ap/svn'
Junio C Hamano [Sun, 25 May 2008 20:37:25 +0000 (13:37 -0700)]
Merge branch 'ap/svn'

* ap/svn:
  git-svn: add test for --add-author-from and --use-log-author
  git-svn: add documentation for --add-author-from option.
  git-svn: Add --add-author-from option.
  git-svn: add documentation for --use-log-author option.

12 years agoMerge branch 'js/cvsexportcommit'
Junio C Hamano [Sun, 25 May 2008 20:37:20 +0000 (13:37 -0700)]
Merge branch 'js/cvsexportcommit'

* js/cvsexportcommit:
  cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
  cvsexportcommit: chomp only removes trailing whitespace

Conflicts:

git-cvsexportcommit.perl

12 years agoMerge branch 'js/ignore-submodule'
Junio C Hamano [Sun, 25 May 2008 20:37:08 +0000 (13:37 -0700)]
Merge branch 'js/ignore-submodule'

* js/ignore-submodule:
  Ignore dirty submodule states during rebase and stash
  Teach update-index about --ignore-submodules
  diff options: Introduce --ignore-submodules

12 years agoMerge branch 'mo/cvsserver'
Junio C Hamano [Sun, 25 May 2008 20:37:04 +0000 (13:37 -0700)]
Merge branch 'mo/cvsserver'

* mo/cvsserver:
  Documentation: Fix skipped section level
  git-cvsserver: add ability to guess -kb from contents
  implement gitcvs.usecrlfattr
  git-cvsserver: add mechanism for managing working tree and current directory

12 years agohttp-push: remove remote locks on exit signals
Clemens Buchacher [Sun, 25 May 2008 18:27:44 +0000 (20:27 +0200)]
http-push: remove remote locks on exit signals

If locks are not cleaned up the repository is inaccessible for 10 minutes.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoReset the signal being handled
Clemens Buchacher [Sun, 25 May 2008 18:26:50 +0000 (20:26 +0200)]
Reset the signal being handled

This did not cause any problems, because remove_lock_file_on_signal is
only registered for SIGINT.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMake git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.
Paul Oliver [Fri, 23 May 2008 18:29:22 +0000 (19:29 +0100)]
Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.

Signed-off-by: Paul Oliver <puzza007@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoDocumentation: convert tutorials to man pages
Christian Couder [Sat, 24 May 2008 18:56:44 +0000 (20:56 +0200)]
Documentation: convert tutorials to man pages

This patch renames the following documents and at the same time converts
them to the man page format:

cvs-migration.txt -> gitcvs-migration.txt
tutorial.txt      -> gittutorial.txt
tutorial-2.txt    -> gittutorial-2.txt

These new man pages are put in section 7, and other documents that reference
the above ones are change accordingly.

[jc: with help from Nanako to clean things up]

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoCodingGuidelines: Add a note to avoid assignments inside if()
Miklos Vajna [Thu, 22 May 2008 23:26:09 +0000 (01:26 +0200)]
CodingGuidelines: Add a note to avoid assignments inside if()

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoRemove redundant code, eliminate one static variable
Heikki Orsila [Fri, 23 May 2008 22:43:55 +0000 (01:43 +0300)]
Remove redundant code, eliminate one static variable

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Sat, 24 May 2008 01:28:52 +0000 (18:28 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
  gitk: Fix bug where current row number display stops working
  gitk: Move es.po where it belongs
  gitk: Fix "wrong # coordinates" error on reload

12 years agoMerge branch 'pb/push'
Junio C Hamano [Fri, 23 May 2008 23:06:07 +0000 (16:06 -0700)]
Merge branch 'pb/push'

* pb/push:
  add special "matching refs" refspec

12 years agoMerge branch 'bc/repack'
Junio C Hamano [Fri, 23 May 2008 23:06:01 +0000 (16:06 -0700)]
Merge branch 'bc/repack'

* bc/repack:
  Documentation/git-repack.txt: document new -A behaviour
  let pack-objects do the writing of unreachable objects as loose objects
  add a force_object_loose() function
  builtin-gc.c: deprecate --prune, it now really has no effect
  git-gc: always use -A when manually repacking
  repack: modify behavior of -A option to leave unreferenced objects unpacked

Conflicts:

builtin-pack-objects.c

12 years agoMerge branch 'sp/ignorecase'
Junio C Hamano [Fri, 23 May 2008 23:05:52 +0000 (16:05 -0700)]
Merge branch 'sp/ignorecase'

* sp/ignorecase:
  t0050: Fix merge test on case sensitive file systems
  t0050: Add test for case insensitive add
  t0050: Set core.ignorecase case to activate case insensitivity
  t0050: Test autodetect core.ignorecase
  git-init: autodetect core.ignorecase

12 years agoMerge branch 'maint'
Junio C Hamano [Fri, 23 May 2008 23:05:46 +0000 (16:05 -0700)]
Merge branch 'maint'

* maint:
  rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
  Add missing "short" alternative to --date in rev-list-options.txt
  git-show.txt: Not very stubby these days.
  Clarify repack -n documentation

12 years agoAdd log.date config variable
Heikki Orsila [Thu, 22 May 2008 15:24:07 +0000 (18:24 +0300)]
Add log.date config variable

log.date config variable sets the default date-time mode for the log
command. Setting log.date value is similar to using git log's --date
option.

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMerge branch 'maint-1.5.4' into maint v1.5.5.2
Junio C Hamano [Fri, 23 May 2008 22:52:43 +0000 (15:52 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

12 years agorev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
Johannes Sixt [Fri, 23 May 2008 14:13:05 +0000 (16:13 +0200)]
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

The intention of --symbolic-full-name is to not print anything if a
revision is not an exact ref. But this command:

    $ git-rev-parse --symbolic-full-name --not master~1

still emitted a sole '^' to stdout (provided that there's no other ref at
master~1). This fixes it.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMake git add -n and git -u -n output consistent
Gustaf Hendeby [Thu, 22 May 2008 21:59:42 +0000 (23:59 +0200)]
Make git add -n and git -u -n output consistent

Output format from "git add -n $path" lists path to blobs that are going
to be added on a single line, separated with SP.  On the other hand, the
suggested "git add -u -n" shows one path per line, like "add '<file>'\n".
Of course, these two are inconsistent.

Plain "git add -n" can afford to only say names of paths, as all it does
is to add (update).  However, "git add -u" needs to be able to express
"remove" somehow.  So if we need to have them formatted the same way, we
need to unify with the "git add -n -u" format.  Incidentally, this is
consistent with how 'update-index' says it.

This changes the output from "git add -n $paths" but as a general
principle, output from Porcelain commands is a fair game for improvements
and not for script consumption.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agochange quoting in test t1006-cat-file.sh
Michele Ballabio [Fri, 23 May 2008 14:19:43 +0000 (16:19 +0200)]
change quoting in test t1006-cat-file.sh

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobuiltin-cat-file.c: use parse_options()
Michele Ballabio [Fri, 23 May 2008 14:19:42 +0000 (16:19 +0200)]
builtin-cat-file.c: use parse_options()

This simplifies the option parsing.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-svn: Speed up fetch
Adam Roben [Fri, 23 May 2008 14:19:41 +0000 (16:19 +0200)]
git-svn: Speed up fetch

We were spending a lot of time forking/execing git-cat-file and
git-hash-object. We now maintain a global Git repository object in order to use
Git.pm's more efficient hash_and_insert_object and cat_blob methods.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoGit.pm: Add hash_and_insert_object and cat_blob
Adam Roben [Fri, 23 May 2008 14:19:40 +0000 (16:19 +0200)]
Git.pm: Add hash_and_insert_object and cat_blob

These functions are more efficient ways of executing `git hash-object -w` and
`git cat-file blob` when you are dealing with many files/objects.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoGit.pm: Add command_bidi_pipe and command_close_bidi_pipe
Adam Roben [Fri, 23 May 2008 14:19:39 +0000 (16:19 +0200)]
Git.pm: Add command_bidi_pipe and command_close_bidi_pipe

command_bidi_pipe hands back the stdin and stdout file handles from the
executed command. command_close_bidi_pipe closes these handles and terminates
the process.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-hash-object: Add --stdin-paths option
Adam Roben [Fri, 23 May 2008 14:19:38 +0000 (16:19 +0200)]
git-hash-object: Add --stdin-paths option

This allows multiple paths to be specified on stdin.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoAdd more tests for git hash-object
Adam Roben [Fri, 23 May 2008 14:19:37 +0000 (16:19 +0200)]
Add more tests for git hash-object

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMove git-hash-object tests from t5303 to t1007
Adam Roben [Fri, 23 May 2008 14:19:36 +0000 (16:19 +0200)]
Move git-hash-object tests from t5303 to t1007

This is a more appropriate location according to t/README.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoUpdated status to show 'Not currently on any branch' in red
Chris Parsons [Thu, 22 May 2008 12:50:02 +0000 (08:50 -0400)]
Updated status to show 'Not currently on any branch' in red

This provides additional warning to users when attempting to
commit to a detached HEAD. It is configurable in color.status.nobranch.

Signed-off-by: Chris Parsons <chris@edendevelopment.co.uk>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoAdd test for cloning with "--reference" repo being a subset of source repo
Johan Herland [Thu, 22 May 2008 22:03:00 +0000 (18:03 -0400)]
Add test for cloning with "--reference" repo being a subset of source repo

The first test in this series tests "git clone -l -s --reference B A C",
where repo B is a superset of repo A (A has one commit, B has the same
commit plus another). In this case, all objects to be cloned are already
present in B.

However, we should also test the case where the "--reference" repo is a
_subset_ of the source repo (e.g. "git clone -l -s --reference A B C"),
i.e. some objects are not available in the "--reference" repo, and will
have to be found in the source repo.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoAdd a test for another combination of --reference
Johan Herland [Thu, 22 May 2008 22:03:05 +0000 (18:03 -0400)]
Add a test for another combination of --reference

In this case, the reference repository has some useful loose objects,
but not all useful objects, and we make sure that we can find the
objects we fetch from the repository we're cloning in the new
repository, instead of potentially being distracted by the reference
repository.

Doing the wrong thing in a builtin-clone implementation would lead to
this looking for an object in the wrong place, not finding it (because
it's only in the right place), and crashing.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoTest that --reference actually suppresses fetching referenced objects
Daniel Barkalow [Thu, 22 May 2008 22:03:08 +0000 (18:03 -0400)]
Test that --reference actually suppresses fetching referenced objects

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoAdd missing "short" alternative to --date in rev-list-options.txt
Heikki Orsila [Thu, 22 May 2008 15:24:41 +0000 (18:24 +0300)]
Add missing "short" alternative to --date in rev-list-options.txt

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-show.txt: Not very stubby these days.
Jon Loeliger [Thu, 22 May 2008 19:59:25 +0000 (14:59 -0500)]
git-show.txt: Not very stubby these days.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoClarify repack -n documentation
Shawn O. Pearce [Thu, 22 May 2008 12:47:19 +0000 (08:47 -0400)]
Clarify repack -n documentation

While repacking a local repository a coworker thought the -n option
was necessary to git-repack to keep it from updating some unknown
file on the central server we all share.  Explaining further what
the option is (not) doing helps to make it clear the option does
not impact any remote repositories the user may have configured.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agopull --rebase: exit early when the working directory is dirty
Johannes Schindelin [Wed, 21 May 2008 11:32:16 +0000 (12:32 +0100)]
pull --rebase: exit early when the working directory is dirty

When rebasing fails during "pull --rebase", you cannot just clean up the
working directory and call "pull --rebase" again, since the remote branch
was already fetched.

Therefore, die early when the working directory is dirty.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogitweb: Convert string to internal form before chopping in chop_str
Anders Waldenborg [Wed, 21 May 2008 11:44:43 +0000 (13:44 +0200)]
gitweb: Convert string to internal form before chopping in chop_str

Fix chop_str not to cut in middle of utf8 multibyte chars. Without
this fix at least author name in short log may cut in middle of a
multibyte char. When the result comes to esc_html to_utf8 is called
again, which doesn't find valid utf8 and decodes using
$fallback_encoding making it even worse.

This also have the nice side effect that it actually tries to show the
first 10 _characters_, not the number of characters that happened to fit
into 10 bytes.

Signed-off-by: Anders Waldenborg <anders@0x63.nu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobisect: use a detached HEAD to bisect
Christian Couder [Thu, 22 May 2008 23:28:57 +0000 (01:28 +0200)]
bisect: use a detached HEAD to bisect

When "git bisect" was first written, it was not possible to
checkout a detached HEAD. The detached feature appeared latter.

That's why before this patch the "git bisect" process used a
"bisect" branch to checkout new revisions to be tested (and also
a "new-bisect" one to check if the checkouts could work).

This patch makes "git bisect" checkout revisions to be tested on
a detached HEAD. This simplifies the code a bit.

The tests to check that "git bisect" does not start if a
"bisect" or a "new-bisect" branch exists are removed as they
are not relevant any more.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobisect: trap critical errors in "bisect_start"
Christian Couder [Thu, 22 May 2008 22:39:22 +0000 (00:39 +0200)]
bisect: trap critical errors in "bisect_start"

Before this patch, when using "git bisect start" with mistaken revs
or when the checkout of the branch we want to test failed, we exited
after having written files like ".git/BISECT_START",
".git/BISECT_NAMES" and after having written "refs/bisect/bad" and
"refs/bisect/good-*" refs.

With this patch we trap all errors that can happen when writing the
new state and when we are in "bisect_next". So that we can try to
clean up everything in case of problems, using "bisect_clean_state".

This patch also contains a "bisect_write" cleanup to make it exit
on error and return 0 otherwise.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobisect: fix left over "BISECT_START" file when starting with junk rev
Christian Couder [Thu, 22 May 2008 22:38:59 +0000 (00:38 +0200)]
bisect: fix left over "BISECT_START" file when starting with junk rev

Before this patch, when using for example:

$ git bisect start <stuff1> <stuff2>

with <stuff1> or <stuff2> that cannot be parsed as a revision, we
could leave a ".git/BISECT_START" file, from a previous
"git bisect start", alone.

This patch makes sure that it does not happen by removing the
"BISECT_START" file in "bisect_clean_state" and then always writing
it again at the end of "bisect_start".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobisect: add test cases to check that "git bisect start" is atomic
Christian Couder [Thu, 22 May 2008 22:38:46 +0000 (00:38 +0200)]
bisect: add test cases to check that "git bisect start" is atomic

This patch adds some test cases to check that "git bisect start"
doesn't leave us in a bad state, especially when it fails.

These test cases show that "git bisect start" is not atomic when it
fails and leave some files like .git/BISECT_START, and in some
cases some refs, over.

The test failures should be fixed in latter commits.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
Paul Mackerras [Thu, 22 May 2008 11:12:19 +0000 (21:12 +1000)]
gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"

Commit 94503a66c56c935e77a8fbe3622f1f56b7134ccc ("gitk: Fix "wrong #
coordinates" error on reload") was correct as far as it went, but
introduced a problem because it didn't also clear out boldrows and
boldnamerows in clear_display.  This resulted in Tcl errors after
scrolling through the graph for a while if some rows were highlighted.
This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
12 years agoDocumentation: Fix skipped section level
Gustaf Hendeby [Thu, 22 May 2008 02:28:43 +0000 (04:28 +0200)]
Documentation: Fix skipped section level

With xmlto 0.0.18 it seems to demand that no section levels are
skipped.  The commit 'implement gitcvs.usecrlfattr' (8a06a632976ead)
one such skip, which here is removed by increasing the level of the
offender.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMerge branch 'maint'
Junio C Hamano [Wed, 21 May 2008 21:42:30 +0000 (14:42 -0700)]
Merge branch 'maint'

* maint:
  git-am: fix typo in usage message
  doc/git-daemon: s/uploadarchive/uploadarch/

12 years agoMerge branch 'maint-1.5.4' into maint
Junio C Hamano [Wed, 21 May 2008 21:27:59 +0000 (14:27 -0700)]
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-am: fix typo in usage message
  doc/git-daemon: s/uploadarchive/uploadarch/

12 years agoMerge branch 'ar/add-unreadable'
Junio C Hamano [Wed, 21 May 2008 21:16:46 +0000 (14:16 -0700)]
Merge branch 'ar/add-unreadable'

* ar/add-unreadable:
  Add a config option to ignore errors for git-add
  Add a test for git-add --ignore-errors
  Add --ignore-errors to git-add to allow it to skip files with read errors
  Extend interface of add_files_to_cache to allow ignore indexing errors
  Make the exit code of add_file_to_index actually useful

12 years agoMerge branch 'ds/branch-auto-rebase'
Junio C Hamano [Wed, 21 May 2008 21:16:33 +0000 (14:16 -0700)]
Merge branch 'ds/branch-auto-rebase'

* ds/branch-auto-rebase:
  Allow tracking branches to set up rebase by default.

12 years agoMerge branch 'sv/first-parent'
Junio C Hamano [Wed, 21 May 2008 21:15:52 +0000 (14:15 -0700)]
Merge branch 'sv/first-parent'

* sv/first-parent:
  revision.c: really honor --first-parent
  Simplify and fix --first-parent implementation

12 years agoMerge branch 'np/pack'
Junio C Hamano [Wed, 21 May 2008 21:15:19 +0000 (14:15 -0700)]
Merge branch 'np/pack'

* np/pack:
  pack-objects: fix early eviction for max depth delta objects
  pack-objects: allow for early delta deflating
  pack-objects: move compression code in a separate function
  pack-objects: clean up write_object() a bit
  pack-objects: simplify the condition associated with --all-progress
  pack-objects: remove some double negative logic
  pack-objects: small cleanup

12 years agoMerge branch 'as/graph'
Junio C Hamano [Wed, 21 May 2008 21:05:02 +0000 (14:05 -0700)]
Merge branch 'as/graph'

* as/graph:
  graph API: eliminate unnecessary indentation
  log and rev-list: add --graph option
  Add history graph API
  revision API: split parent rewriting and parent printing options

12 years agoMerge branch 'jk/maint-send-email-compose'
Junio C Hamano [Wed, 21 May 2008 20:57:50 +0000 (13:57 -0700)]
Merge branch 'jk/maint-send-email-compose'

* jk/maint-send-email-compose:
  send-email: rfc2047-quote subject lines with non-ascii characters
  send-email: specify content-type of --compose body

Conflicts:

t/t9001-send-email.sh

Due to 065096c (git-send-email.perl: Handle shell metacharacters in
$EDITOR properly, 2008-05-04) which is a backward incompatible change (but
it makes handling of EDITOR consistent with other parts of the system),
the test script t9001 had to be adjusted.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMerge branch 'hb/maint-send-email-quote-recipients'
Junio C Hamano [Wed, 21 May 2008 20:09:31 +0000 (13:09 -0700)]
Merge branch 'hb/maint-send-email-quote-recipients'

* hb/maint-send-email-quote-recipients:
  Fix recipient santitization

12 years agocvsexportcommit: Create config option for CVS dir
Trent Piepho [Thu, 8 May 2008 21:26:55 +0000 (14:26 -0700)]
cvsexportcommit: Create config option for CVS dir

For a given project the directory used with the -w option is almost always
the same each time.  Let it be specified with 'cvsexportcommit.cvsdir' so
it's not necessary to manually add it with -w each time.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Acked-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoFix recipient santitization
Horst H. von Brand [Fri, 28 Mar 2008 14:09:04 +0000 (11:09 -0300)]
Fix recipient santitization

Need to quote all special characters, not just the first one

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agosend-email: rfc2047-quote subject lines with non-ascii characters
Jeff King [Fri, 28 Mar 2008 21:29:01 +0000 (17:29 -0400)]
send-email: rfc2047-quote subject lines with non-ascii characters

We always use 'utf-8' as the encoding, since we currently
have no way of getting the information from the user.

This also refactors the quoting of recipient names, since
both processes can share the rfc2047 quoting code.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agosend-email: specify content-type of --compose body
Jeff King [Fri, 28 Mar 2008 21:28:33 +0000 (17:28 -0400)]
send-email: specify content-type of --compose body

If the compose message contains non-ascii characters, then
we assume it is in utf-8 and include the appropriate MIME
headers. If the user has already included a MIME-Version
header, then we assume they know what they are doing and
don't add any headers.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoDocumentation: rev-parse: add a few "--verify" and "--default" examples
Christian Couder [Tue, 13 May 2008 04:51:41 +0000 (06:51 +0200)]
Documentation: rev-parse: add a few "--verify" and "--default" examples

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-merge: exclude unnecessary options from OPTIONS_SPEC
Miklos Vajna [Mon, 12 May 2008 17:22:56 +0000 (19:22 +0200)]
git-merge: exclude unnecessary options from OPTIONS_SPEC

gitcli(5) already documents them, and there are no options named
--no-no-stat, --no-no-summary and --no-no-log.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years ago"git-add -n -u" should not add but just report
Junio C Hamano [Wed, 21 May 2008 19:04:34 +0000 (12:04 -0700)]
"git-add -n -u" should not add but just report

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoFix t3701 if core.filemode disabled
Alex Riesen [Tue, 20 May 2008 21:59:32 +0000 (23:59 +0200)]
Fix t3701 if core.filemode disabled

[jc: squashed in suggestions from Jeff King]

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoclone: fall back to copying if hardlinking fails
Daniel Barkalow [Tue, 20 May 2008 18:15:14 +0000 (14:15 -0400)]
clone: fall back to copying if hardlinking fails

Note that it stops trying hardlinks if any fail.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoFix t6031 on filesystems without working exec bit
Alex Riesen [Sun, 18 May 2008 14:57:27 +0000 (16:57 +0200)]
Fix t6031 on filesystems without working exec bit

The point of the test is not really to test the ability of the
filesystem to keep the given x-bit, but to check is merge-recursive
correctly handles it.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoFix prepare-commit-msg hook and replace in-place sed
Marcel Koeppen [Wed, 21 May 2008 16:25:54 +0000 (18:25 +0200)]
Fix prepare-commit-msg hook and replace in-place sed

The patterns to the case statement could never be matched, so the hook
was a noop. This patch also replaces the non-portable use of in-place sed.

Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogitk: Fix bug where current row number display stops working
Paul Mackerras [Tue, 20 May 2008 10:51:06 +0000 (20:51 +1000)]
gitk: Fix bug where current row number display stops working

The display of the current row number would stop working if the user
clicked on a line, or if selectedline got unset for any other reason,
because the trace on it got lost when it was unselected.  This fixes
it by changing the places that unset selectedline to set it to the
empty string instead, and the places that tested for it being set or
unset to compare it with the empty string.  Thus it never gets unset
now.  This actually simplified the code in a few places since it can
be compared for equality with a row number now without first testing
if it is set.

Signed-off-by: Paul Mackerras <paulus@samba.org>
12 years agogit-am: fix typo in usage message
Jeff King [Mon, 19 May 2008 20:09:06 +0000 (16:09 -0400)]
git-am: fix typo in usage message

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agodoc/git-daemon: s/uploadarchive/uploadarch/
Jeff King [Mon, 19 May 2008 20:08:33 +0000 (16:08 -0400)]
doc/git-daemon: s/uploadarchive/uploadarch/

The git-daemon upload-archive feature has always used the
config directive 'daemon.uploadarch'; the documentation
which came later seems to have just mistakenly used the
wrong name.

Noticed by lionel@over-blog.com.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoDocumentation: Add missing git svn commands
Gustaf Hendeby [Mon, 19 May 2008 22:47:28 +0000 (00:47 +0200)]
Documentation: Add missing git svn commands

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agounpack-trees: allow Porcelain to give different error messages
Junio C Hamano [Sat, 17 May 2008 19:03:49 +0000 (12:03 -0700)]
unpack-trees: allow Porcelain to give different error messages

The plumbing output is sacred as it is an API.  We _could_ change it if it
is broken in such a way that it cannot convey necessary information fully,
but we just do not _reword_ for the sake of rewording.  If somebody does
not like it, s/he is complaining too late.  S/he should have been here in
early May 2005 and make the language used by the API closer to what humans
read.  S/he wasn't here.  Too bad, and it is too late.

And people who complain should look at a bigger picture.  Look at what was
suggested by one of them and think for five seconds:

     $ git checkout mytopic
    -fatal: Entry 'frotz' not uptodate. Cannot merge.
    +fatal: Entry 'frotz' has local changes. Cannot merge.

If you do not see something wrong with this output, your brain has already
been rotten with use of git for too long a time.  Nobody asked us to
"merge" but why are we talking about "Cannot merge"?

This patch introduces a mechanism to allow Porcelains to specify messages
that are different from the ones that is given by the underlying plumbing
implementation of read-tree, so that we can reword the message Porcelains give
without disrupting the output from the plumbing.

    $ git-checkout pu
    error: You have local changes to 'Makefile'; cannot switch branches.

There are other places that ask unpack_trees() to n-way merge, detect
issues  and let it issue error message on its own, but I did this as a
demonstration and replaced only one message.

Yes I know about C99 structure initializers.  I'd love to use them but we
try to be nice to compilers without it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agot/Makefile: "trash" directory was renamed recently
Brandon Casey [Sun, 18 May 2008 04:03:03 +0000 (23:03 -0500)]
t/Makefile: "trash" directory was renamed recently

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoEnsure that a test is run in the trash directory
Alex Riesen [Sun, 18 May 2008 15:27:00 +0000 (17:27 +0200)]
Ensure that a test is run in the trash directory

Exit with error if cd into the "trash directory" failed (error
already reported, so just exit).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobuiltin-clone.c: Need to closedir() in copy_or_link_directory()
Brandon Casey [Sun, 18 May 2008 04:00:01 +0000 (23:00 -0500)]
builtin-clone.c: Need to closedir() in copy_or_link_directory()

So not to leak file descriptors, close the directory after opening it.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogitk: Move es.po where it belongs
Michele Ballabio [Sat, 17 May 2008 17:16:31 +0000 (19:16 +0200)]
gitk: Move es.po where it belongs

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
12 years agogitk: Fix "wrong # coordinates" error on reload
Paul Mackerras [Sun, 18 May 2008 23:48:45 +0000 (09:48 +1000)]
gitk: Fix "wrong # coordinates" error on reload

This fixes the Tk error "wrong # coordinates: expected 0 or 4, got 2"
that sometimes occurred when reloading.  The problem was that we didn't
unset the variables containing the canvas item id numbers for the
displayed rows when we cleared the canvases.  Thus make_secsel would
think it had something to do when it didn't.

Thanks to Michele Ballabio for finding a way to trigger the bug
reliably.

Signed-off-by: Paul Mackerras <paulus@samba.org>
12 years agobuiltin-apply: do not declare patch is creation when we do not know it
Junio C Hamano [Sat, 17 May 2008 09:02:44 +0000 (02:02 -0700)]
builtin-apply: do not declare patch is creation when we do not know it

When we see no context nor deleted line in the patch, we used to declare
that the patch creates a new file.  But some people create an empty file
and then apply a patch to it.  Similarly, a patch that delete everything
is not a deletion patch either.

This commit corrects these two issues.  Together with the previous commit,
it allows a diff between an empty file and a line-ful file to be treated
as both creation patch and "add stuff to an existing empty file",
depending on the context.  A new test t4126 demonstrates the fix.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agot0050: Fix merge test on case sensitive file systems
Steffen Prohaska [Thu, 15 May 2008 05:19:54 +0000 (07:19 +0200)]
t0050: Fix merge test on case sensitive file systems

On a case sensitive filesystem, "git reset --hard" might refuse to
overwrite a file whose name differs only by case, even if
core.ignorecase is set.  It is not clear which circumstances cause this
behavior.  This commit simply works around the problem by removing
the case changing file before running "git reset --hard".

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMakefile: update the default build options for AIX
Mike Ralphson [Wed, 7 May 2008 08:35:55 +0000 (09:35 +0100)]
Makefile: update the default build options for AIX

NO_MKDTEMP is required to build, FREAD_READS_DIRECTORIES and the definition
of _LARGE_FILES fix test suite failures and INTERNAL_QSORT is required for
adequate performance.

Tested on AIX v5.3 Maintenance Level 06

Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobuiltin-apply: accept patch to an empty file
Junio C Hamano [Sat, 17 May 2008 08:51:31 +0000 (01:51 -0700)]
builtin-apply: accept patch to an empty file

A patch from a foreign SCM (or plain "diff" output) often have both
preimage and postimage filename on ---/+++ lines even for a patch that
creates a new file.  However, when there is a filename for preimage, we
used to insist the file to exist (either in the work tree and/or in the
index).  When we cannot be sure by parsing the patch that it is not a
creation patch, we shouldn't complain when if there is no such a file.
This commit fixes the logic.

Refactor the code that validates the preimage file into a separate
function while we are at it, as it is getting rather big.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agobuiltin-apply: typofix
Junio C Hamano [Sat, 17 May 2008 08:46:47 +0000 (01:46 -0700)]
builtin-apply: typofix

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoMerge branch 'maint'
Junio C Hamano [Sat, 17 May 2008 05:10:13 +0000 (22:10 -0700)]
Merge branch 'maint'

* maint:
  git-filter-branch: Clarify file removal example.

12 years agoReplace in-place sed in t7502-commit
Marcel Koeppen [Fri, 16 May 2008 00:21:43 +0000 (02:21 +0200)]
Replace in-place sed in t7502-commit

The in-place mode of sed used in t7502-commit is a non-POSIX extension.
That call of sed is replaced by a more portable version using a temporary file.

Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-filter-branch: Clarify file removal example.
Jon Loeliger [Fri, 16 May 2008 19:43:50 +0000 (14:43 -0500)]
git-filter-branch: Clarify file removal example.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agosubmodule update: add convenience option --init
Johannes Schindelin [Fri, 16 May 2008 10:23:03 +0000 (11:23 +0100)]
submodule update: add convenience option --init

When a submodule is not initialized and you do not want to change the
defaults from .gitmodules anyway, you can now say

$ git submodule update --init <name>

When "update" is called without --init on an uninitialized submodule,
a hint to use --init is printed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoDocumentation/git-repack.txt: document new -A behaviour
Chris Frey [Fri, 16 May 2008 02:37:31 +0000 (22:37 -0400)]
Documentation/git-repack.txt: document new -A behaviour

Add paragraph for the -A option, and describe the new behaviour
that makes unreachable objects loose.

Signed-off-by: Chris Frey <cdfrey@foursquare.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-fast-import: rename cmd_*() functions to parse_*()
Miklos Vajna [Thu, 15 May 2008 22:35:56 +0000 (00:35 +0200)]
git-fast-import: rename cmd_*() functions to parse_*()

There is a cmd_merge() function in fast-import that will conflict with
builtin-merge's cmd_merge() function. To keep it consistent, rename all
cmd_*() function to parse_*()

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoDocumentation/git-web--browse.txt: fix small typo
Teemu Likonen [Thu, 15 May 2008 17:52:22 +0000 (20:52 +0300)]
Documentation/git-web--browse.txt: fix small typo

Change "brower.konqueror.path" to "browser.konqueror.path" in
documentation.

Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoUse '-f' option to point to the .gitmodules file
Imran M Yousuf [Thu, 15 May 2008 07:42:58 +0000 (13:42 +0600)]
Use '-f' option to point to the .gitmodules file

'git config' has a '-f' option that takes the file to parse.
Using it rather than the environment variable seems more logical
and simplified.

Signed-off-by: Imran M Yousuf <imyousuf@smartitengineering.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-cvsserver: add ability to guess -kb from contents
Matthew Ogilvie [Thu, 15 May 2008 04:35:48 +0000 (22:35 -0600)]
git-cvsserver: add ability to guess -kb from contents

If "gitcvs.allbinary" is set to "guess", then any file that has
not been explicitly marked as binary or text using the "crlf" attribute
and the "gitcvs.usecrlfattr" config will guess binary based on the contents
of the file.

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoimplement gitcvs.usecrlfattr
Matthew Ogilvie [Thu, 15 May 2008 04:35:47 +0000 (22:35 -0600)]
implement gitcvs.usecrlfattr

If gitcvs.usecrlfattr is set to true, git-cvsserver will consult
the "crlf" for each file to determine if it should mark the file
as binary (-kb).

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agogit-cvsserver: add mechanism for managing working tree and current directory
Matthew Ogilvie [Thu, 15 May 2008 04:35:46 +0000 (22:35 -0600)]
git-cvsserver: add mechanism for managing working tree and current directory

There are various reasons git-cvsserver needs to manipulate the current
directory, and this patch attempts to clarify and validate such changes:

1. Temporary empty working directory (with index) for certain operations
   that require an index file to work.
2. Use a temporary directory with temporary file names for doing
   merges of user's dirty sandbox state with latest changes in
   repository.
3. Coming up soon: Set up an index and either a valid or empty
   working directory when calling git-check-attr to decide
   if a file should be marked binary (-kb).

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agocvsexportcommit: introduce -W for shared working trees (between Git and CVS)
Johannes Schindelin [Wed, 14 May 2008 14:29:49 +0000 (15:29 +0100)]
cvsexportcommit: introduce -W for shared working trees (between Git and CVS)

If you have a CVS checkout, it is easy to import the CVS history by
calling "git cvsimport".  However, interacting with the CVS repository
using "git cvsexportcommit" was cumbersome, since that script assumes
separate working directories for Git and CVS.

Now, you can call cvsexportcommit with the -W option.  This will
automatically discover the GIT_DIR, and it will check out the parent
commit before exporting the commit.

The intended workflow is this:

$ CVSROOT=$URL cvs co module
$ cd module
$ git cvsimport
hack, hack, hack, making two commits, cleaning them up using rebase -i.
$ git cvsexportcommit -W -c -p -u HEAD^
$ git cvsexportcommit -W -c -p -u HEAD

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoIgnore dirty submodule states during rebase and stash
Johannes Schindelin [Wed, 14 May 2008 17:03:59 +0000 (18:03 +0100)]
Ignore dirty submodule states during rebase and stash

When rebasing or stashing, chances are that you do not care about
dirty submodules, since they are not updated by those actions anyway.
So ignore the submodules' states.

Note: the submodule states -- as committed in the superproject --
will still be stashed and rebased, it is _just_ the state of the
submodule in the working tree which is ignored.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agoTeach update-index about --ignore-submodules
Johannes Schindelin [Wed, 14 May 2008 17:03:45 +0000 (18:03 +0100)]
Teach update-index about --ignore-submodules

Like with the diff machinery, update-index should sometimes just
ignore submodules (e.g. to determine a clean state before a rebase).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agodiff options: Introduce --ignore-submodules
Johannes Schindelin [Wed, 14 May 2008 17:03:31 +0000 (18:03 +0100)]
diff options: Introduce --ignore-submodules

The new option --ignore-submodules can now be used to ignore changes in
submodules.

Why?  Sometimes it is not interesting when a submodule changed.

For example, when reordering some commits in the superproject, a dirty
submodule is usually totally uninteresting.  So we will use this option
in git-rebase to test for a dirty working tree.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 years agocvsexportcommit: chomp only removes trailing whitespace
Johannes Schindelin [Wed, 14 May 2008 22:30:43 +0000 (23:30 +0100)]
cvsexportcommit: chomp only removes trailing whitespace

In commit fef3a7cc(cvsexportcommit: be graceful when "cvs status"
reorders the arguments), caution was taken to get the status even
for files with leading or trailing whitespace.

However, the author of that commit missed that chomp() removes only
trailing newlines.  With help of the mailing list, the author realized
his mistake and provided this patch.

The idea is that we do not want to rely on a certain layout of the
output of "cvs status".  Therefore we only call it with files that are
unambiguous after stripping leading and trailing whitespace.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>