git.git
15 years agoMerge branch 'cc/merge-base-many'
Junio C Hamano [Thu, 21 Aug 2008 06:41:38 +0000 (23:41 -0700)]
Merge branch 'cc/merge-base-many'

* cc/merge-base-many:
  git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
  merge-base-many: add trivial tests based on the documentation
  documentation: merge-base: explain "git merge-base" with more than 2 args
  merge-base: teach "git merge-base" to drive underlying merge_bases_many()

15 years agoMerge branch 'jc/test-deeper'
Junio C Hamano [Thu, 21 Aug 2008 06:40:59 +0000 (23:40 -0700)]
Merge branch 'jc/test-deeper'

* jc/test-deeper:
  tests: use $TEST_DIRECTORY to refer to the t/ directory

15 years agoMerge branch 'js/parallel-test'
Junio C Hamano [Thu, 21 Aug 2008 06:40:56 +0000 (23:40 -0700)]
Merge branch 'js/parallel-test'

* js/parallel-test:
  Update t/.gitignore to ignore all trash directories
  Enable parallel tests
  tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
  t9700: remove useless check

15 years agoUpdate draft release notes for 1.6.1
Junio C Hamano [Wed, 20 Aug 2008 23:32:15 +0000 (16:32 -0700)]
Update draft release notes for 1.6.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Wed, 20 Aug 2008 23:18:16 +0000 (16:18 -0700)]
Merge branch 'maint'

* maint:
  Update draft release notes for 1.6.0.1
  Add hints to revert documentation about other ways to undo changes
  Install templates with the user and group of the installing personality
  "git-merge": allow fast-forwarding in a stat-dirty tree
  completion: find out supported merge strategies correctly
  decorate: allow const objects to be decorated
  for-each-ref: cope with tags with incomplete lines
  diff --check: do not get confused by new blank lines in the middle
  remote.c: remove useless if-before-free test
  mailinfo: avoid violating strbuf assertion
  git format-patch: avoid underrun when format.headers is empty or all NLs

15 years agoUpdate draft release notes for 1.6.0.1
Junio C Hamano [Wed, 20 Aug 2008 22:19:00 +0000 (15:19 -0700)]
Update draft release notes for 1.6.0.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoAdd hints to revert documentation about other ways to undo changes
Tarmigan Casebolt [Tue, 19 Aug 2008 19:50:31 +0000 (12:50 -0700)]
Add hints to revert documentation about other ways to undo changes

Based on its name, people may read the 'git revert' documentation when
they want to undo local changes, especially people who have used other
SCM's.  'git revert' may not be what they had in mind, but git
provides several other ways to undo changes to files.  We can help
them by pointing them towards the git commands that do what they might
want to do.

Cc: Daniel Barkalow <barkalow@iabervon.org>
Cc: Lea Wiemann <lewiemann@gmail.com>
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoInstall templates with the user and group of the installing personality
Johannes Sixt [Wed, 20 Aug 2008 15:36:25 +0000 (17:36 +0200)]
Install templates with the user and group of the installing personality

If 'make install' was run with sufficient privileges, then the installed
templates, which are copied using 'tar', would receive the user and group
of whoever built git. This instructs 'tar' to ignore the user and group
that are recorded in the archive.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago"git-merge": allow fast-forwarding in a stat-dirty tree
Junio C Hamano [Wed, 20 Aug 2008 22:09:28 +0000 (15:09 -0700)]
"git-merge": allow fast-forwarding in a stat-dirty tree

We used to refresh the index to clear stat-dirtyness before a fast-forward
merge.  Recent C rewrite forgot to do this.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agocompletion: find out supported merge strategies correctly
Junio C Hamano [Wed, 20 Aug 2008 21:13:42 +0000 (14:13 -0700)]
completion: find out supported merge strategies correctly

"git-merge" is a binary executable these days, and looking for assignment
to $all_strategies variable with grep/sed does not work well.

When asked for an unknown strategy, pre-1.6.0 and post-1.6.0 "git merge"
commands respectively say:

    $ $HOME/git-snap-v1.5.6.5/bin/git merge -s help
    available strategies are: recur recursive octopus resolve stupid ours subtree
    $ $HOME/git-snap-v1.6.0/bin/git merge -s help
    Could not find merge strategy 'help'.
    Available strategies are: recursive octopus resolve ours subtree.

both on their standard error stream.  We can use this to learn what
strategies are supported.

The sed script is written in such a way that it catches both old and new
message styles ("Available" vs "available", and the full stop at the end).
It also allows future versions of "git merge" to line-wrap the list of
strategies, and add extra comments, like this:

    $ $HOME/git-snap-v1.6.1/bin/git merge -s help
    Could not find merge strategy 'help'.
    Available strategies are: blame recursive octopus resolve ours
    subtree.
    Also you have custom strategies: theirs

    Make sure you spell strategy names correctly.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agodecorate: allow const objects to be decorated
Jeff King [Wed, 20 Aug 2008 17:55:33 +0000 (13:55 -0400)]
decorate: allow const objects to be decorated

We don't actually modify the struct object, so there is no
reason not to accept const versions (and this allows other
callsites, like the next patch, to use the decoration
machinery).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agofor-each-ref: cope with tags with incomplete lines
Junio C Hamano [Wed, 20 Aug 2008 19:29:27 +0000 (12:29 -0700)]
for-each-ref: cope with tags with incomplete lines

If you have a tag with a single, incomplete line as its payload, asking
git-for-each-ref for its %(body) element accessed a NULL pointer.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agodiff --check: do not get confused by new blank lines in the middle
Junio C Hamano [Wed, 20 Aug 2008 18:47:55 +0000 (11:47 -0700)]
diff --check: do not get confused by new blank lines in the middle

The code remembered that the last diff output it saw was an empty line,
and tried to reset that state whenever it sees a context line, a non-blank
new line, or a new hunk.  However, this codepath asks the underlying diff
engine to feed diff without any context, and the "just saw an empty line"
state was not reset if you added a new blank line in the last hunk of your
patch, even if it is not the last line of the file.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'bd/diff-strbuf'
Junio C Hamano [Wed, 20 Aug 2008 04:43:40 +0000 (21:43 -0700)]
Merge branch 'bd/diff-strbuf'

* bd/diff-strbuf:
  xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
  Use strbuf for struct xdiff_emit_state's remainder
  Make xdi_diff_outf interface for running xdiff_outf diffs

15 years agoMerge branch 'dp/hash-literally'
Junio C Hamano [Wed, 20 Aug 2008 04:43:25 +0000 (21:43 -0700)]
Merge branch 'dp/hash-literally'

* dp/hash-literally:
  add --no-filters option to git hash-object
  add --path option to git hash-object
  use parse_options() in git hash-object
  correct usage help string for git-hash-object
  correct argument checking test for git hash-object
  teach index_fd to work with pipes

15 years agoMerge branch 'js/checkout-dwim-local'
Junio C Hamano [Wed, 20 Aug 2008 04:43:04 +0000 (21:43 -0700)]
Merge branch 'js/checkout-dwim-local'

* js/checkout-dwim-local:
  checkout --track: make up a sensible branch name if '-b' was omitted

15 years agoMerge branch 'ph/enable-threaded'
Junio C Hamano [Wed, 20 Aug 2008 04:43:01 +0000 (21:43 -0700)]
Merge branch 'ph/enable-threaded'

* ph/enable-threaded:
  Enable threaded delta search on *BSD and Linux.

15 years agoMerge branch 'jk/pager-swap'
Junio C Hamano [Wed, 20 Aug 2008 04:42:55 +0000 (21:42 -0700)]
Merge branch 'jk/pager-swap'

* jk/pager-swap:
  spawn pager via run_command interface
  run-command: add pre-exec callback

15 years agoMerge branch 'rs/imap'
Junio C Hamano [Wed, 20 Aug 2008 04:42:46 +0000 (21:42 -0700)]
Merge branch 'rs/imap'

* rs/imap:
  Documentation: Improve documentation for git-imap-send(1)
  imap-send.c: more style fixes
  imap-send.c: style fixes
  git-imap-send: Support SSL
  git-imap-send: Allow the program to be run from subdirectories of a git tree

15 years agoMerge branch 'js/mingw-stat'
Junio C Hamano [Wed, 20 Aug 2008 04:25:48 +0000 (21:25 -0700)]
Merge branch 'js/mingw-stat'

* js/mingw-stat:
  Revert "Windows: Use a customized struct stat that also has the st_blocks member."
  compat: introduce on_disk_bytes()

15 years agoremote.c: remove useless if-before-free test
Jim Meyering [Tue, 19 Aug 2008 18:46:30 +0000 (20:46 +0200)]
remote.c: remove useless if-before-free test

We removed a handful of these useless if-before-free tests several months
ago.  This change removes a new one that snuck back in.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agomailinfo: avoid violating strbuf assertion
Jeff King [Tue, 19 Aug 2008 17:28:24 +0000 (13:28 -0400)]
mailinfo: avoid violating strbuf assertion

In handle_from, we calculate the end boundary of a section
to remove from a strbuf using strcspn like this:

  el = strcspn(buf, set_of_end_boundaries);
  strbuf_remove(&sb, start, el + 1);

This works fine if "el" is the offset of the boundary
character, meaning we remove up to and including that
character. But if the end boundary didn't match (that is, we
hit the end of the string as the boundary instead) then we
want just "el". Asking for "el+1" caught an out-of-bounds
assertion in the strbuf library.

This manifested itself when we got a 'From' header that had
just an email address with nothing else in it (the end of
the string was the end of the address, rather than, e.g., a
trailing '>' character), causing git-mailinfo to barf.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoreword --full-index description
Jim Meyering [Wed, 2 Jul 2008 07:49:59 +0000 (09:49 +0200)]
reword --full-index description

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoSubmittingPatches: fix a typo
Jim Meyering [Tue, 1 Apr 2008 12:53:51 +0000 (14:53 +0200)]
SubmittingPatches: fix a typo

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoadd boolean diff.suppress-blank-empty config option
Jim Meyering [Fri, 15 Aug 2008 11:39:26 +0000 (13:39 +0200)]
add boolean diff.suppress-blank-empty config option

GNU diff's --suppress-blank-empty option makes it so that diff no
longer outputs trailing white space unless the input data has it.
With this option, empty context lines are now empty also in diff -u output.
Before, they would have a single trailing space.

 * diff.c (diff_suppress_blank_empty): New global.
   (git_diff_basic_config): Set it.
   (fn_out_consume): Honor it.
 * t/t4029-diff-trailing-space.sh: New file.
 * Documentation/config.txt: Document it.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit format-patch: avoid underrun when format.headers is empty or all NLs
Jim Meyering [Tue, 19 Aug 2008 18:42:04 +0000 (20:42 +0200)]
git format-patch: avoid underrun when format.headers is empty or all NLs

* builtin-log.c (add_header): Avoid a buffer underrun when
format.headers is empty or all newlines.  Reproduce with this:
git config format.headers '' && git format-patch -1

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Tue, 19 Aug 2008 07:40:53 +0000 (00:40 -0700)]
Merge branch 'maint'

* maint:
  t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
  adapt git-cvsserver manpage to dash-free syntax
  mailinfo: re-fix MIME multipart boundary parsing

15 years agot1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
Brandon Casey [Mon, 18 Aug 2008 23:17:53 +0000 (18:17 -0500)]
t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'

Some old platforms have an old diff which doesn't have the -U option.
'git diff' can be used in its place. Adjust the comparison function to
strip git's additional header lines to make this possible.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoUpdate t/.gitignore to ignore all trash directories
Marcus Griep [Mon, 18 Aug 2008 16:25:40 +0000 (12:25 -0400)]
Update t/.gitignore to ignore all trash directories

The current .gitignore only ignores the old "trash directory" and
not the new "trash directory.[test]".  This ignores both forms.

Signed-off-by: Marcus Griep <marcus@griep.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoRevert "Windows: Use a customized struct stat that also has the st_blocks member."
Johannes Sixt [Mon, 18 Aug 2008 20:01:06 +0000 (22:01 +0200)]
Revert "Windows: Use a customized struct stat that also has the st_blocks member."

This reverts commit fc2ded5b08e071beed974117c0148781b1acc94a.

As we do not need the member in struct stat, we do not need to have a
custom "struct mingw_stat" anymore.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agocompat: introduce on_disk_bytes()
Junio C Hamano [Mon, 18 Aug 2008 19:57:16 +0000 (21:57 +0200)]
compat: introduce on_disk_bytes()

Some platforms do not have st_blocks member in "struct stat"; mingw
already emulates it by rounding it up to closest 512-byte blocks (even
though it could overcount when a file has holes).

The reason to use the member is only to figure out how many kilobytes the
files occupy on-disk, so give a helper function in git-compat-util.h to
compute this value.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
15 years agoadapt git-cvsserver manpage to dash-free syntax
Robert Schiele [Mon, 18 Aug 2008 14:17:04 +0000 (16:17 +0200)]
adapt git-cvsserver manpage to dash-free syntax

Signed-off-by: Robert Schiele <rschiele@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agomailinfo: re-fix MIME multipart boundary parsing
Don Zickus [Thu, 14 Aug 2008 15:35:42 +0000 (11:35 -0400)]
mailinfo: re-fix MIME multipart boundary parsing

Recent changes to is_multipart_boundary() caused git-mailinfo to segfault.
The reason was after handling the end of the boundary the code tried to look
for another boundary.  Because the boundary list was empty, dereferencing
the pointer to the top of the boundary caused the program to go boom.

The fix is to check to see if the list is empty and if so go on its merry
way instead of looking for another boundary.

I also fixed a couple of increments and decrements that didn't look correct
relating to content_top.

The boundary test case was updated to catch future problems like this again.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoStart 1.6.1 cycle
Junio C Hamano [Sun, 17 Aug 2008 22:48:51 +0000 (15:48 -0700)]
Start 1.6.1 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoStart 1.6.0.X maintenance series
Junio C Hamano [Sun, 17 Aug 2008 22:44:11 +0000 (15:44 -0700)]
Start 1.6.0.X maintenance series

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoGIT 1.6.0 v1.6.0
Junio C Hamano [Sun, 17 Aug 2008 18:42:10 +0000 (11:42 -0700)]
GIT 1.6.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge git-gui 0.11.0
Junio C Hamano [Sun, 17 Aug 2008 18:40:56 +0000 (11:40 -0700)]
Merge git-gui 0.11.0

15 years agoMerge branch 'ak/p4'
Junio C Hamano [Sun, 17 Aug 2008 17:53:57 +0000 (10:53 -0700)]
Merge branch 'ak/p4'

* ak/p4:
  Utilise our new p4_read_pipe and p4_write_pipe wrappers
  Add p4 read_pipe and write_pipe wrappers
  Put in the two other configuration elements found in the source
  Put some documentation in about the parameters that have been added
  Move git-p4.syncFromOrigin into a configuration parameters section
  Consistently use 'git-p4' for the configuration entries
  If the user has configured various parameters, use them.
  Switch to using 'p4_build_cmd'
  If we are in verbose mode, output what we are about to run (or return)
  Add a single command that will be used to construct the 'p4' command
  Utilise the new 'p4_system' function.
  Have a command that specifically invokes 'p4' (via system)
  Utilise the new 'p4_read_pipe_lines' command
  Create a specific version of the read_pipe_lines command for p4 invocations

Conflicts:
contrib/fast-import/git-p4

15 years agotests: use $TEST_DIRECTORY to refer to the t/ directory
Junio C Hamano [Fri, 8 Aug 2008 09:26:28 +0000 (02:26 -0700)]
tests: use $TEST_DIRECTORY to refer to the t/ directory

Many test scripts assumed that they will start in a 'trash' subdirectory
that is a single level down from the t/ directory, and referred to their
test vector files by asking for files like "../t9999/expect".  This will
break if we move the 'trash' subdirectory elsewhere.

To solve this, we earlier introduced "$TEST_DIRECTORY" so that they can
refer to t/ directory reliably.  This finally makes all the tests use
it to refer to the outside environment.

With this patch, and a one-liner not included here (because it would
contradict with what Dscho really wants to do):

| diff --git a/t/test-lib.sh b/t/test-lib.sh
| index 70ea7e0..60e69e4 100644
| --- a/t/test-lib.sh
| +++ b/t/test-lib.sh
| @@ -485,7 +485,7 @@ fi
|  . ../GIT-BUILD-OPTIONS
|
|  # Test repository
| -test="trash directory"
| +test="trash directory/another level/yet another"
|  rm -fr "$test" || {
|         trap - exit
|         echo >&5 "FATAL: Cannot prepare test area"

all the tests still pass, but we would want extra sets of eyeballs on this
type of change to really make sure.

[jc: with help from Stephan Beyer on http-push tests I do not run myself;
 credits for locating silly quoting errors go to Olivier Marin.]

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit-p4: chdir now properly sets PWD environment variable in msysGit
Robert Blum [Fri, 1 Aug 2008 19:50:03 +0000 (12:50 -0700)]
git-p4: chdir now properly sets PWD environment variable in msysGit

P4 on Windows expects the PWD environment variable to be set to the
current working dir, but os.chdir in python doesn't do so.

Signed-off-by: Robert Blum <rob.blum@gmail.com>
Acked-by: Simon Hausmann <simon@lst.de>
Acked-by: Han-Wen Nienhuys <hanwen@xs4all.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoImprove error output of git-rebase
Stephan Beyer [Sun, 17 Aug 2008 04:25:43 +0000 (06:25 +0200)]
Improve error output of git-rebase

"git rebase" without arguments on initial startup showed:

fatal: Needed a single revision
invalid upstream

This patch makes it show the ordinary usage string.

If .git/rebase-merge or .git/rebase-apply/rebasing exists, git-rebase
will die with a message saying that a rebase is in progress and the user
should try --skip/--abort/--continue.

If .git/rebase-apply/applying exists, git-rebase will die with a message
saying that git-am is in progress, regardless how many arguments are
given.

If no arguments are given and .git/rebase-apply/ exists, but neither a
rebasing nor applying file is in that directory, git-rebase dies with a
message saying that rebase-apply exists and no arguments were given.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agot9300: replace '!' with test_must_fail
Miklos Vajna [Sat, 16 Aug 2008 15:17:42 +0000 (17:17 +0200)]
t9300: replace '!' with test_must_fail

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge git://git.kernel.org/pub/scm/gitk/gitk
Junio C Hamano [Sun, 17 Aug 2008 06:21:07 +0000 (23:21 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow safely calling nukefile from a run queue handler

15 years agoGit.pm: Make File::Spec and File::Temp requirement lazy
Marcus Griep [Fri, 15 Aug 2008 19:53:59 +0000 (15:53 -0400)]
Git.pm: Make File::Spec and File::Temp requirement lazy

This will ensure that the API at large is accessible to nearly
all Perl versions, while only the temp file caching API is tied to
the File::Temp and File::Spec modules being available.

Signed-off-by: Marcus Griep <marcus@griep.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoDocumentation: document the pager.* configuration setting
Miklos Vajna [Sat, 16 Aug 2008 02:14:33 +0000 (04:14 +0200)]
Documentation: document the pager.* configuration setting

It was already documented in RelNotes-1.6.0, but not in the git-config
manual page.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit-stash: improve synopsis in help and manual page
Stephan Beyer [Sat, 16 Aug 2008 03:27:31 +0000 (05:27 +0200)]
git-stash: improve synopsis in help and manual page

"git stash -h" showed some incomplete and ugly usage information.
For example, the useful "--keep-index" option for "save" or the "--index"
option for  "apply" were not shown. Also in the documentation synopsis they
were not shown, so that there is no incentive to scroll down and even see
that such options exist.

This patch improves the git-stash synopsis in the documentation by
mentioning that further options to the stash commands and then copies
this synopsis to the usage information string of git-stash.sh.

For the latter, the dashless git command string has to be inserted on the
second and the following usage lines. The code of this is taken from
git-sh-setup so that all lines will show the command string.

Note that the "create" command is not advertised at all now, because
it was not mentioned in git-stash.txt.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMakefile: building git in cygwin 1.7.0
Eric Blake [Fri, 15 Aug 2008 15:01:03 +0000 (15:01 +0000)]
Makefile: building git in cygwin 1.7.0

On platforms with $X, make removes any leftover scripts 'a' from
earlier builds if a new binary 'a.exe' is now built.  However, on
cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file.
Test for file equality before attempting a remove, in order to avoid
nuking just-built binaries.

Signed-off-by: Eric Blake <ebb9@byu.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit-am: ignore --binary option
Stephan Beyer [Fri, 8 Aug 2008 23:28:54 +0000 (01:28 +0200)]
git-am: ignore --binary option

The git-apply documentation says that --binary is a historical option.
This patch lets git-am ignore --binary and removes advertisements of this
option.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agobash-completion: Add non-command git help files to bash-completion
Marcus Griep [Fri, 15 Aug 2008 17:59:28 +0000 (13:59 -0400)]
bash-completion: Add non-command git help files to bash-completion

Git allows access to the gitattributes man page via `git help attributes`,
but this is not discoverable via the bash-completion mechanism.  This
patch adds all current non-command man pages to the completion candidate
list.

Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoFix t3700 on filesystems which do not support question marks in names
Alex Riesen [Fri, 15 Aug 2008 07:32:30 +0000 (09:32 +0200)]
Fix t3700 on filesystems which do not support question marks in names

Use square brackets instead.

And the prominent example of the deficiency are, as usual, the filesystems
of Microsoft house.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoUtilise our new p4_read_pipe and p4_write_pipe wrappers
Anand Kumria [Thu, 14 Aug 2008 22:40:39 +0000 (23:40 +0100)]
Utilise our new p4_read_pipe and p4_write_pipe wrappers

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoAdd p4 read_pipe and write_pipe wrappers
Anand Kumria [Thu, 14 Aug 2008 22:40:38 +0000 (23:40 +0100)]
Add p4 read_pipe and write_pipe wrappers

Two additional wrappers to cover 3 places where we utilise p4 in piped
form.  Found by Tor Arvid Lund.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agobash completion: Add '--merge' long option for 'git log'
Lee Marlow [Thu, 14 Aug 2008 22:41:11 +0000 (16:41 -0600)]
bash completion: Add '--merge' long option for 'git log'

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agobash completion: Add completion for 'git mergetool'
Lee Marlow [Thu, 14 Aug 2008 22:41:10 +0000 (16:41 -0600)]
bash completion: Add completion for 'git mergetool'

The --tool= long option to "git mergetool" can be completed with:

kdiff3 tkdiff meld xxdiff emerge
vimdiff gvimdiff ecmerge opendiff

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit format-patch documentation: clarify what --cover-letter does
Matt McCutchen [Thu, 14 Aug 2008 17:37:41 +0000 (13:37 -0400)]
git format-patch documentation: clarify what --cover-letter does

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agobash completion: 'git apply' should use 'fix' not 'strip'
Eric Raible [Thu, 14 Aug 2008 17:12:54 +0000 (10:12 -0700)]
bash completion: 'git apply' should use 'fix' not 'strip'

Bring completion up to date with the man page.

Signed-off-by: Eric Raible <raible@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoxdiff-interface: hide the whole "xdiff_emit_state" business from the caller
Junio C Hamano [Thu, 14 Aug 2008 06:18:22 +0000 (23:18 -0700)]
xdiff-interface: hide the whole "xdiff_emit_state" business from the caller

This further enhances xdi_diff_outf() interface so that it takes two
common parameters: the callback function that processes one line at a
time, and a pointer to its application specific callback data structure.
xdi_diff_outf() creates its own "xdiff_emit_state" structure and stashes
these two away inside it, which is used by the lowest level output
function in the xdiff_outf() callchain, consume_one(), to call back to the
application layer.  With this restructuring, we lift the requirement that
the caller supplied callback data structure embeds xdiff_emit_state
structure as its first member.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoUse strbuf for struct xdiff_emit_state's remainder
Brian Downing [Thu, 14 Aug 2008 05:36:51 +0000 (00:36 -0500)]
Use strbuf for struct xdiff_emit_state's remainder

Continually xreallocing and freeing the remainder member of struct
xdiff_emit_state was a noticeable performance hit.  Use a strbuf
instead.

This yields a decent performance improvement on "git blame" on certain
repositories.  For example, before this commit:

$ time git blame -M -C -C -p --incremental server.c >/dev/null
101.52user 0.17system 1:41.73elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+39561minor)pagefaults 0swaps

With this commit:

$ time git blame -M -C -C -p --incremental server.c >/dev/null
80.38user 0.30system 1:20.81elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+50979minor)pagefaults 0swaps

Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMake xdi_diff_outf interface for running xdiff_outf diffs
Brian Downing [Thu, 14 Aug 2008 05:36:50 +0000 (00:36 -0500)]
Make xdi_diff_outf interface for running xdiff_outf diffs

To prepare for the need to initialize and release resources for an
xdi_diff with the xdiff_outf output function, make a new function to
wrap this usage.

Old:

ecb.outf = xdiff_outf;
ecb.priv = &state;
...
xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);

New:

xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);

Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Thu, 14 Aug 2008 02:22:29 +0000 (19:22 -0700)]
Merge branch 'maint'

* maint:
  t5304-prune: adjust file mtime based on system time rather than file mtime
  Fix escaping of glob special characters in pathspecs

15 years agot5304-prune: adjust file mtime based on system time rather than file mtime
Brandon Casey [Thu, 14 Aug 2008 00:49:30 +0000 (19:49 -0500)]
t5304-prune: adjust file mtime based on system time rather than file mtime

test-chmtime can adjust the mtime of a file based on the file's mtime, or
based on the system time. For files accessed over NFS, the file's mtime is
set by the NFS server, and as such may vary a great deal from the NFS
client's system time if the clocks of the client and server are out of
sync. Since these tests are testing the expire feature of git-prune, an
incorrect mtime could cause a file to be expired or not expired incorrectly
and produce a test failure.

Avoid this NFS pitfall by modifying the calls to test-chmtime so that the
mtime is adjusted based on the system time, rather than the file's mtime.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agotest-parse-options: use appropriate cast in length_callback
Brandon Casey [Thu, 14 Aug 2008 00:48:57 +0000 (19:48 -0500)]
test-parse-options: use appropriate cast in length_callback

OPT_CALLBACK() is passed &integer which is now an "int" rather than
"unsigned long". Update the length_callback function.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoFix escaping of glob special characters in pathspecs
Kevin Ballard [Wed, 13 Aug 2008 22:34:34 +0000 (15:34 -0700)]
Fix escaping of glob special characters in pathspecs

match_one implements an optimized pathspec match where it only uses
fnmatch if it detects glob special characters in the pattern. Unfortunately
it didn't treat \ as a special character, so attempts to escape a glob
special character would fail even though fnmatch() supports it.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agorebase -i -p: fix parent rewriting
Thomas Rast [Wed, 13 Aug 2008 21:41:24 +0000 (23:41 +0200)]
rebase -i -p: fix parent rewriting

The existing parent rewriting did not handle the case where a previous
commit was amended (via edit or squash).  Fix by always putting the
new sha1 of the last commit into the $REWRITTEN map.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
15 years agorebase -i -p: handle index and workdir correctly
Thomas Rast [Wed, 13 Aug 2008 21:41:23 +0000 (23:41 +0200)]
rebase -i -p: handle index and workdir correctly

'git rebase -i -p' forgot to update the index and working directory
during fast forwards.  Fix this.  Makes 'GIT_EDITOR=true rebase -i -p
<ancestor>' a no-op again.

Also, it attempted to do a fast forward even if it was instructed not
to commit (via -n).  Fall back to the cherry-pick code path and let
that handle the issue for us.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
15 years agoGIT 1.6.0-rc3 v1.6.0-rc3
Junio C Hamano [Wed, 13 Aug 2008 04:42:22 +0000 (21:42 -0700)]
GIT 1.6.0-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Wed, 13 Aug 2008 05:46:22 +0000 (22:46 -0700)]
Merge branch 'maint'

* maint:
  Do not talk about "diff" in rev-list documentation.

15 years agoDo not talk about "diff" in rev-list documentation.
Junio C Hamano [Mon, 11 Aug 2008 18:46:56 +0000 (11:46 -0700)]
Do not talk about "diff" in rev-list documentation.

Since 8c02eee (git-rev-list(1): group options; reformat; document more
options, 2006-09-01), git-rev-list documentation talks as if it supports
any kind of diff output.  It doesn't.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge git://git.bogomips.org/git-svn
Junio C Hamano [Wed, 13 Aug 2008 04:41:29 +0000 (21:41 -0700)]
Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: Reduce temp file usage when dealing with non-links
  git-svn: Make it incrementally faster by minimizing temp files
  Git.pm: Add faculties to allow temp files to be cached

15 years agogit-svn: Reduce temp file usage when dealing with non-links
Marcus Griep [Tue, 12 Aug 2008 16:45:39 +0000 (12:45 -0400)]
git-svn: Reduce temp file usage when dealing with non-links

Currently, in sub 'close_file', git-svn creates a temporary file and
copies the contents of the blob to be written into it. This is useful
for symlinks because svn stores symlinks in the form:

link $FILE_PATH

Git creates a blob only out of '$FILE_PATH' and uses file mode to
indicate that the blob should be interpreted as a symlink.

As git-hash-object is invoked with --stdin-paths, a duplicate of the
link from svn must be created that leaves off the first five bytes,
i.e. 'link '. However, this is wholly unnecessary for normal blobs,
though, as we already have a temp file with their contents. Copying
the entire file gains nothing, and effectively requires a file to be
written twice before making it into the object db.

This patch corrects that issue, holding onto the substr-like
duplication for symlinks, but skipping it altogether for normal blobs
by reusing the existing temp file.

Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Eric Wong <normalperson@yhbt.net>
15 years agogit-svn: Make it incrementally faster by minimizing temp files
Marcus Griep [Tue, 12 Aug 2008 16:00:53 +0000 (12:00 -0400)]
git-svn: Make it incrementally faster by minimizing temp files

Currently, git-svn would create a temp file on four occasions:
1. Reading a blob out of the object db
2. Creating a delta from svn
3. Hashing and writing a blob into the object db
4. Reading a blob out of the object db (in another place in code)

Any time git-svn did the above, it would dutifully create and then
delete said temp file.  Unfortunately, this means that between 2-4
temporary files are created/deleted per file 'add/modify'-ed in
svn (O(n)).  This causes significant overhead and helps the inode
counter to spin beautifully.

By its nature, git-svn is a serial beast.  Thus, reusing a temp file
does not pose significant problems.  "truncate and seek" takes much
less time than "unlink and create".  This patch centralizes the
tempfile creation and holds onto the tempfile until they are deleted
on exit.  This significantly reduces file overhead, now requiring
at most three (3) temp files per run (O(1)).

Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Eric Wong <normalperson@yhbt.net>
15 years agoGit.pm: Add faculties to allow temp files to be cached
Marcus Griep [Tue, 12 Aug 2008 16:00:18 +0000 (12:00 -0400)]
Git.pm: Add faculties to allow temp files to be cached

This patch offers a generic interface to allow temp files to be
cached while using an instance of the 'Git' package. If many
temp files are created and destroyed during the execution of a
program, this caching mechanism can help reduce the amount of
files created and destroyed by the filesystem.

The temp_acquire method provides a weak guarantee that a temp
file will not be stolen by subsequent requests. If a file is
locked when another acquire request is made, a simple error is
thrown.

Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Eric Wong <normalperson@yhbt.net>
15 years agoDocumentation: rev-list-options: Rewrite simplification descriptions for clarity
Thomas Rast [Mon, 11 Aug 2008 23:55:36 +0000 (01:55 +0200)]
Documentation: rev-list-options: Rewrite simplification descriptions for clarity

This completely rewrites the documentation of --full-history with lots
of examples.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoTeach git diff about BibTeX head hunk patterns
Gustaf Hendeby [Tue, 12 Aug 2008 14:24:26 +0000 (16:24 +0200)]
Teach git diff about BibTeX head hunk patterns

All BibTeX entries starts with an @ followed by an entry type.  Since
there are many entry types and own can be defined, the pattern matches
legal entry type names instead of just the default types (which would
be a long list).  The pattern also matches strings and comments since
they will also be useful to position oneself in a bib-file.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogitattributes: Document built in hunk header patterns
Gustaf Hendeby [Tue, 12 Aug 2008 14:24:25 +0000 (16:24 +0200)]
gitattributes: Document built in hunk header patterns

Since the hunk header pattern text was written patterns for Ruby and
Pascal/Delphi have been added.  For users to be able to find them they
should be documented not only in code.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit-daemon: SysV needs the signal handler reinstated.
Stephen R. van den Berg [Tue, 12 Aug 2008 19:36:13 +0000 (21:36 +0200)]
git-daemon: SysV needs the signal handler reinstated.

Fixes the bug on (amongst others) Solaris that only the first
child ever is reaped.

Signed-off-by: Stephen R. van den Berg <srb@cuci.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agodiff --check: do not unconditionally complain about trailing empty lines
Junio C Hamano [Tue, 12 Aug 2008 05:15:28 +0000 (22:15 -0700)]
diff --check: do not unconditionally complain about trailing empty lines

Recently "git diff --check" learned to detect new trailing blank lines
just like "git apply --whitespace" does.  However this check should not
trigger unconditionally.  This patch makes it honor the whitespace
settings from core.whitespace and gitattributes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Tue, 12 Aug 2008 02:24:28 +0000 (19:24 -0700)]
Merge branch 'maint'

* maint:
  git-bisect: fix wrong usage of read(1)

15 years agoPut in the two other configuration elements found in the source
Anand Kumria [Sun, 10 Aug 2008 18:26:35 +0000 (19:26 +0100)]
Put in the two other configuration elements found in the source

I am not entirely clear what these parameters do but felt it
 useful to call them out in the documentation.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoPut some documentation in about the parameters that have been added
Anand Kumria [Sun, 10 Aug 2008 18:26:34 +0000 (19:26 +0100)]
Put some documentation in about the parameters that have been added

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMove git-p4.syncFromOrigin into a configuration parameters section
Anand Kumria [Sun, 10 Aug 2008 18:26:33 +0000 (19:26 +0100)]
Move git-p4.syncFromOrigin into a configuration parameters section

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoConsistently use 'git-p4' for the configuration entries
Anand Kumria [Sun, 10 Aug 2008 18:26:32 +0000 (19:26 +0100)]
Consistently use 'git-p4' for the configuration entries

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoIf the user has configured various parameters, use them.
Anand Kumria [Sun, 10 Aug 2008 18:26:31 +0000 (19:26 +0100)]
If the user has configured various parameters, use them.

Some repositories require authentication and access to certain
 hosts. Allow git-p4 to pull this information from the configuration

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoSwitch to using 'p4_build_cmd'
Anand Kumria [Sun, 10 Aug 2008 18:26:30 +0000 (19:26 +0100)]
Switch to using 'p4_build_cmd'

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoIf we are in verbose mode, output what we are about to run (or return)
Anand Kumria [Sun, 10 Aug 2008 18:26:29 +0000 (19:26 +0100)]
If we are in verbose mode, output what we are about to run (or return)

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoAdd a single command that will be used to construct the 'p4' command
Anand Kumria [Sun, 10 Aug 2008 18:26:28 +0000 (19:26 +0100)]
Add a single command that will be used to construct the 'p4' command

Rather than having three locations where the 'p4' command is built up,
 refactor this into the one place. This will, eventually, allow us to
 have one place where we modify the evironment or pass extra
 command-line options to the 'p4' binary.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoUtilise the new 'p4_system' function.
Anand Kumria [Sun, 10 Aug 2008 18:26:27 +0000 (19:26 +0100)]
Utilise the new 'p4_system' function.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoHave a command that specifically invokes 'p4' (via system)
Anand Kumria [Sun, 10 Aug 2008 18:26:26 +0000 (19:26 +0100)]
Have a command that specifically invokes 'p4' (via system)

Similiar to our 'p4_read_pipe_lines' command, we can isolate
 specific changes to the invocation method in the one location
 with this change.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoUtilise the new 'p4_read_pipe_lines' command
Anand Kumria [Sun, 10 Aug 2008 18:26:25 +0000 (19:26 +0100)]
Utilise the new 'p4_read_pipe_lines' command

Now that we have the new command, we can utilise it and then
 eventually, isolate any changes required to the one place.

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoCreate a specific version of the read_pipe_lines command for p4 invocations
Anand Kumria [Sun, 10 Aug 2008 18:26:24 +0000 (19:26 +0100)]
Create a specific version of the read_pipe_lines command for p4 invocations

This will make it easier to isolate changes to how 'p4' is invoked
 (whether with parameters or not, etc.).

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoDocumentation: rev-list-options: Fix a typo
Thomas Rast [Mon, 11 Aug 2008 23:55:35 +0000 (01:55 +0200)]
Documentation: rev-list-options: Fix a typo

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoAdjust for the new way of enabling the default post-update hook
Petr Baudis [Mon, 11 Aug 2008 22:34:46 +0000 (00:34 +0200)]
Adjust for the new way of enabling the default post-update hook

The post-update hook, which is required to be enabled in order for
the repository to be accessible over HTTP, is not enabled by
chmod a+x anymore, but instead by dropping the .sample suffix.

This patch emphasizes this change in the release notes (since
I believe this is rather noticeable backwards-incompatible change).
It also adjusts the documentation which still described the old way
and fixes t/t5540-http-push.sh, which was broken for 1.5 month
but apparently noone ever runs this test.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agogit-bisect: fix wrong usage of read(1)
Francis Moreau [Mon, 11 Aug 2008 17:37:46 +0000 (19:37 +0200)]
git-bisect: fix wrong usage of read(1)

Signed-off-by: Francis Moreau <francis.moro@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoFix typo in comments of longest_ancestor_length()
Nguyễn Thái Ngọc Duy [Sun, 10 Aug 2008 15:26:23 +0000 (22:26 +0700)]
Fix typo in comments of longest_ancestor_length()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agocheckout --track: make up a sensible branch name if '-b' was omitted
Johannes Schindelin [Sat, 9 Aug 2008 14:00:12 +0000 (16:00 +0200)]
checkout --track: make up a sensible branch name if '-b' was omitted

What does the user most likely want with this command?

$ git checkout --track origin/next

Exactly.  A branch called 'next', that tracks origin's branch 'next'.
Make it so.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Mon, 11 Aug 2008 21:28:35 +0000 (14:28 -0700)]
Merge branch 'maint'

* maint:
  Re-fix rev-list-options documentation

15 years agoRe-fix rev-list-options documentation
Junio C Hamano [Mon, 11 Aug 2008 21:24:51 +0000 (14:24 -0700)]
Re-fix rev-list-options documentation

18a2197 (Documentation: rev-list-options: Fix -g paragraph formatting,
2008-08-10) introduced the third paragraph that is continued, but it seems
to confuse docbook toolchain on FC9 machines.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoMerge branch 'maint'
Junio C Hamano [Mon, 11 Aug 2008 07:53:31 +0000 (00:53 -0700)]
Merge branch 'maint'

* maint:
  Documentation: fix invalid reference to 'mybranch' in user manual
  Fix deleting reflog entries from HEAD reflog
  reflog test: add more tests for 'reflog delete'
  Documentation: rev-list-options: Fix -g paragraph formatting

Conflicts:
Documentation/user-manual.txt

15 years agoDocumentation: fix invalid reference to 'mybranch' in user manual
Ivan Stankovic [Sun, 10 Aug 2008 16:22:14 +0000 (18:22 +0200)]
Documentation: fix invalid reference to 'mybranch' in user manual

Signed-off-by: Ivan Stankovic <pokemon@fly.srk.fer.hr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years agoFix deleting reflog entries from HEAD reflog
Junio C Hamano [Mon, 11 Aug 2008 06:21:25 +0000 (23:21 -0700)]
Fix deleting reflog entries from HEAD reflog

dwim_ref() used to resolve HEAD symbolic ref to its target (i.e. current
branch).  This incorrectly removed the reflog entry from the current
branch when 'git reflog delete HEAD@{1}' was asked for.

Signed-off-by: Junio C Hamano <gitster@pobox.com>