git/git.git
8 years agoMerge branch 'tr/unpack-entry-use-after-free-fix'
Junio C Hamano [Fri, 3 May 2013 22:18:04 +0000 (15:18 -0700)]
Merge branch 'tr/unpack-entry-use-after-free-fix'

* tr/unpack-entry-use-after-free-fix:
  unpack_entry: avoid freeing objects in base cache

8 years agoSync with maint
Junio C Hamano [Fri, 3 May 2013 22:17:38 +0000 (15:17 -0700)]
Sync with maint

* maint:
  completion: zsh: don't override suffix on _detault
  Documentation/git-commit: Typo under --edit

8 years agoMerge branch 'tr/remote-tighten-commandline-parsing' into maint
Junio C Hamano [Fri, 3 May 2013 22:12:38 +0000 (15:12 -0700)]
Merge branch 'tr/remote-tighten-commandline-parsing' into maint

* tr/remote-tighten-commandline-parsing:
  remote: 'show' and 'prune' can take more than one remote
  remote: check for superfluous arguments in 'git remote add'
  remote: add a test for extra arguments, according to docs

8 years agoMerge branch 'jn/glossary-revision' into maint
Junio C Hamano [Fri, 3 May 2013 22:12:16 +0000 (15:12 -0700)]
Merge branch 'jn/glossary-revision' into maint

* jn/glossary-revision:
  glossary: a revision is just a commit

8 years agocompletion: zsh: don't override suffix on _detault
Felipe Contreras [Fri, 3 May 2013 21:35:50 +0000 (16:35 -0500)]
completion: zsh: don't override suffix on _detault

zsh is smart enough to add the right suffix while completing, there's no
point in trying to do the same as bash.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoDocumentation/git-commit: Typo under --edit
Anders Granskogen Bjørnstad [Thu, 2 May 2013 18:24:15 +0000 (20:24 +0200)]
Documentation/git-commit: Typo under --edit

-C takes a commit object, not a file.

Signed-off-by: Anders Granskogen Bjørnstad <andersgb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUpdate draft release notes to 1.8.3
Junio C Hamano [Wed, 1 May 2013 22:32:24 +0000 (15:32 -0700)]
Update draft release notes to 1.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoFix grammar in the 1.8.3 release notes.
Marc Branchaud [Mon, 29 Apr 2013 19:15:04 +0000 (15:15 -0400)]
Fix grammar in the 1.8.3 release notes.

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'hb/git-pm-tempfile'
Junio C Hamano [Wed, 1 May 2013 22:24:15 +0000 (15:24 -0700)]
Merge branch 'hb/git-pm-tempfile'

* hb/git-pm-tempfile:
  Git.pm: call tempfile from File::Temp as a regular function

8 years agoMerge branch 'rs/pp-user-info-without-extra-allocation'
Junio C Hamano [Wed, 1 May 2013 22:24:08 +0000 (15:24 -0700)]
Merge branch 'rs/pp-user-info-without-extra-allocation'

* rs/pp-user-info-without-extra-allocation:
  pretty: remove intermediate strbufs from pp_user_info()
  pretty: simplify output line length calculation in pp_user_info()
  pretty: simplify input line length calculation in pp_user_info()

8 years agoMerge branch 'tr/remote-tighten-commandline-parsing'
Junio C Hamano [Wed, 1 May 2013 22:24:01 +0000 (15:24 -0700)]
Merge branch 'tr/remote-tighten-commandline-parsing'

* tr/remote-tighten-commandline-parsing:
  remote: 'show' and 'prune' can take more than one remote
  remote: check for superfluous arguments in 'git remote add'
  remote: add a test for extra arguments, according to docs

8 years agoMerge branch 'zk/prompt-rebase-step'
Junio C Hamano [Wed, 1 May 2013 22:23:56 +0000 (15:23 -0700)]
Merge branch 'zk/prompt-rebase-step'

* zk/prompt-rebase-step:
  bash-prompt.sh: show where rebase is at when stopped

8 years agounpack_entry: avoid freeing objects in base cache
Thomas Rast [Tue, 30 Apr 2013 12:53:06 +0000 (14:53 +0200)]
unpack_entry: avoid freeing objects in base cache

In the !delta_data error path of unpack_entry(), we run free(base).
This became a window for use-after-free() in abe601b (sha1_file:
remove recursion in unpack_entry, 2013-03-27), as follows:

Before abe601b, we got the 'base' from cache_or_unpack_entry(..., 0);
keep_cache=0 tells it to also remove that entry.  So the 'base' is at
this point not cached, and freeing it in the error path is the right
thing.

After abe601b, the structure changed: we use a three-phase approach
where phase 1 finds the innermost base or a base that is already in
the cache.  In phase 3 we therefore know that all bases we unpack are
not part of the delta cache yet.  (Observe that we pop from the cache
in phase 1, so this is also true for the very first base.)  So we make
no further attempts to look up the bases in the cache, and just call
add_delta_base_cache() on every base object we have assembled.

But the !delta_data error path remained unchanged, and now calls
free() on a base that has already been entered in the cache.  This
means that there is a use-after-free if we later use the same base
again.

So remove that free(); we are still going to use that data.

Reported-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-completion.bash: add remote.pushdefault to config list
Ramkumar Ramachandra [Mon, 29 Apr 2013 12:49:41 +0000 (18:19 +0530)]
git-completion.bash: add remote.pushdefault to config list

224c2171 (remote.c: introduce remote.pushdefault, 2013-04-02)
introduced the remote.pushdefault configuration variable, but forgot
to teach git-completion.bash about it.  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-completion.bash: add branch.*.pushremote to config list
Ramkumar Ramachandra [Mon, 29 Apr 2013 12:49:40 +0000 (18:19 +0530)]
git-completion.bash: add branch.*.pushremote to config list

9f765ce (remote.c: introduce branch.<name>.pushremote, 2013-04-02)
introduced the configuration variable branch.*.pushremote, but forgot
to teach git-completion.bash about it.  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Mon, 29 Apr 2013 16:57:38 +0000 (09:57 -0700)]
Merge branch 'maint'

* maint:
  complete: zsh: use zsh completion for the main cmd
  complete: zsh: trivial simplification
  git-completion.bash: complete branch.*.rebase as boolean
  git-completion.bash: add diff.submodule to config list
  git-completion.bash: lexical sorting for diff.statGraphWidth

8 years agoMerge branch 'fc/zsh-completion' into maint
Junio C Hamano [Mon, 29 Apr 2013 16:52:18 +0000 (09:52 -0700)]
Merge branch 'fc/zsh-completion' into maint

* fc/zsh-completion:
  complete: zsh: use zsh completion for the main cmd
  complete: zsh: trivial simplification

8 years agocomplete: zsh: use zsh completion for the main cmd
Felipe Contreras [Sat, 27 Apr 2013 20:34:06 +0000 (15:34 -0500)]
complete: zsh: use zsh completion for the main cmd

So that we can have a nice zsh completion output:

% git <tab>
add       -- add file contents to the index
bisect    -- find by binary search the change that introduced a bug
branch    -- list, create, or delete branches
checkout  -- checkout a branch or paths to the working tree
clone     -- clone a repository into a new directory
commit    -- record changes to the repository
diff      -- show changes between commits, commit and working tree, etc
fetch     -- download objects and refs from another repository
grep      -- print lines matching a pattern
init      -- create an empty Git repository or reinitialize an existing one
log       -- show commit logs
merge     -- join two or more development histories together
mv        -- move or rename a file, a directory, or a symlink
pull      -- fetch from and merge with another repository or a local branch
push      -- update remote refs along with associated objects
rebase    -- forward-port local commits to the updated upstream head
reset     -- reset current HEAD to the specified state
rm        -- remove files from the working tree and from the index
show      -- show various types of objects
status    -- show the working tree status
tag       -- create, list, delete or verify a tag object signed with GPG

And other niceties, like 'git --git-dir=<tab>' showing only directories.

For the rest, the bash completion stuff is still used.

Also, add my copyright, since this more than a thin wrapper.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agocomplete: zsh: trivial simplification
Felipe Contreras [Sat, 27 Apr 2013 20:34:05 +0000 (15:34 -0500)]
complete: zsh: trivial simplification

There should be no functional changes.

The only reason I wrapped this code around a sub-function is because zsh
did the same in it's bashcompinit script in order to declare the special
variable 'words' as hidden, but only in this context.

There's no need for that any more since we access __git_main directly,
so 'words' is not modified, so there's no need for the sub-function.

In zsh mode the array indexes are different though.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-completion.bash: complete branch.*.rebase as boolean
Ramkumar Ramachandra [Mon, 29 Apr 2013 12:49:39 +0000 (18:19 +0530)]
git-completion.bash: complete branch.*.rebase as boolean

6fac1b83 (completion: add missing config variables, 2009-06-29) added
"rebase" to the list of completions for "branch.*.*", but forgot to
specify completions for the values that this configuration variable
can take (namely "false" and "true").  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-completion.bash: add diff.submodule to config list
Ramkumar Ramachandra [Mon, 29 Apr 2013 12:49:38 +0000 (18:19 +0530)]
git-completion.bash: add diff.submodule to config list

c47ef57 (diff: introduce diff.submodule configuration variable,
2012-11-13) introduced the diff.submodule configuration variable, but
forgot to teach git-completion.bash about it.  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-completion.bash: lexical sorting for diff.statGraphWidth
Ramkumar Ramachandra [Mon, 29 Apr 2013 12:49:37 +0000 (18:19 +0530)]
git-completion.bash: lexical sorting for diff.statGraphWidth

df44483a (diff --stat: add config option to limit graph width,
2012-03-01) added the option diff.startGraphWidth to the list of
configuration variables in git-completion.bash, but failed to notice
that the list is sorted alphabetically.  Move it to its rightful place
in the list.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoGit.pm: call tempfile from File::Temp as a regular function
H. Merijn Brand [Mon, 29 Apr 2013 08:09:57 +0000 (01:09 -0700)]
Git.pm: call tempfile from File::Temp as a regular function

We call File::Temp's "tempfile" function as a class method, but it was
never designed to be called this way. Older versions seemed to
tolerate it, but as of File::Temp 0.23, it blows up like this:

  $ git svn fetch
  'tempfile' can't be called as a method at .../Git.pm line 1117.

Fix it by calling it as a regular function, just inside the File::Temp
namespace.

Signed-off-by: H. Merijn Brand <h.m.brand@xs4all.nl>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Sun, 28 Apr 2013 21:47:24 +0000 (14:47 -0700)]
Merge branch 'maint'

* maint:
  documentation: trivial whitespace cleanups
  t/Makefile: remove smoke test targets

8 years agodocumentation: trivial whitespace cleanups
Felipe Contreras [Sat, 27 Apr 2013 22:00:07 +0000 (17:00 -0500)]
documentation: trivial whitespace cleanups

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot/Makefile: remove smoke test targets
John Keeping [Fri, 26 Apr 2013 17:58:24 +0000 (18:58 +0100)]
t/Makefile: remove smoke test targets

Commit d24fbca (Remove Git's support for smoke testing - 2011-12-23)
removed the smoke test support from the test suite but it was
re-added by commit 342e9ef (Introduce a performance testing
framework - 2012-02-17).  This appears to be the result of a
mis-rebase, since re-adding the smoke testing infrastructure does
not relate to the subject of that commit.

The current 'smoke' target is broken since the 'harness' script it
uses no longer exists, so just reapply this section of commit d24fbca
and remove all of the smoke testing section in the makefile.

Signed-off-by: John Keeping <john@keeping.me.uk>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'nd/pretty-formats'
Junio C Hamano [Sun, 28 Apr 2013 19:10:03 +0000 (12:10 -0700)]
Merge branch 'nd/pretty-formats'

* nd/pretty-formats:
  pretty: Fix bug in truncation support for %>, %< and %><

8 years agopretty: Fix bug in truncation support for %>, %< and %><
Ramsay Jones [Sat, 27 Apr 2013 19:43:36 +0000 (20:43 +0100)]
pretty: Fix bug in truncation support for %>, %< and %><

Some systems experience failures in t4205-*.sh (tests 18-20, 27)
which all relate to the use of truncation with the %< padding
placeholder. This capability was added in the commit a7f01c6b
("pretty: support truncating in %>, %< and %><", 19-04-2013).

The truncation support was implemented with the assistance of a
new strbuf function (strbuf_utf8_replace). This function contains
the following code:

       strbuf_attach(sb_src, strbuf_detach(&sb_dst, NULL),
                     sb_dst.len, sb_dst.alloc);

Unfortunately, this code is subject to unspecified behaviour. In
particular, the order of evaluation of the argument expressions
(along with the associated side effects) is not specified by the
C standard. Note that the second argument expression is a call to
strbuf_detach() which, as a side effect, sets the 'len' and 'alloc'
fields of the sb_dst argument to zero. Depending on the order of
evaluation of the argument expressions to the strbuf_attach call,
this can lead to assigning an empty string to 'sb_src'.

In order to remove the undesired behaviour, we replace the above
line of code with:

       strbuf_swap(sb_src, &sb_dst);
       strbuf_release(&sb_dst);

which achieves the desired effect without provoking unspecified
behaviour.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/check-corrupt-objects-carefully'
Junio C Hamano [Sun, 28 Apr 2013 18:57:54 +0000 (11:57 -0700)]
Merge branch 'jk/check-corrupt-objects-carefully'

* jk/check-corrupt-objects-carefully:
  clone: Make the 'junk_mode' symbol a file static

8 years agoclone: Make the 'junk_mode' symbol a file static
Ramsay Jones [Sat, 27 Apr 2013 18:39:04 +0000 (19:39 +0100)]
clone: Make the 'junk_mode' symbol a file static

Sparse issues an "'junk_mode' not declared. Should it be static?"
warning. In order to suppress the warning, since this symbol does
not need more than file visibility, we simply add the static
modifier to its declaration.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/merge-tree-added-identically'
Junio C Hamano [Sun, 28 Apr 2013 18:53:57 +0000 (11:53 -0700)]
Merge branch 'jk/merge-tree-added-identically'

off-by-one fix.

* jk/merge-tree-added-identically:
  merge-tree: fix typo in "both changed identically"

8 years agomerge-tree: fix typo in "both changed identically"
John Keeping [Sat, 27 Apr 2013 13:40:33 +0000 (14:40 +0100)]
merge-tree: fix typo in "both changed identically"

Commit aacecc3 (merge-tree: don't print entries that match "local" -
2013-04-07) had a typo causing the "same in both" check to be incorrect
and check if both the base and "their" versions are removed instead of
checking that both the "our" and "their" versions are removed.  Fix
this.

Reported-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Test-written-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agocompletion: add missing format-patch options
Felipe Contreras [Sat, 27 Apr 2013 20:17:44 +0000 (15:17 -0500)]
completion: add missing format-patch options

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoGit 1.8.3-rc0 v1.8.3-rc0
Junio C Hamano [Fri, 26 Apr 2013 22:45:09 +0000 (15:45 -0700)]
Git 1.8.3-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'rr/shortlog-doc'
Junio C Hamano [Fri, 26 Apr 2013 22:28:39 +0000 (15:28 -0700)]
Merge branch 'rr/shortlog-doc'

Update documentation for "log" and "shortlog".

* rr/shortlog-doc:
  builtin/shortlog.c: make usage string consistent with log
  builtin/log.c: make usage string consistent with doc
  git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
  git-log.txt: rewrite note on why "--" may be required
  git-log.txt: generalize <since>..<until>
  git-log.txt: order OPTIONS properly; move <since>..<until>
  revisions.txt: clarify the .. and ... syntax
  git-shortlog.txt: remove (-h|--help) from OPTIONS

8 years agoMerge branch 'th/bisect-skipped-log'
Junio C Hamano [Fri, 26 Apr 2013 22:28:37 +0000 (15:28 -0700)]
Merge branch 'th/bisect-skipped-log'

* th/bisect-skipped-log:
  bisect: Log possibly bad, skipped commits at bisection end

8 years agoMerge branch 'ph/rebase-original'
Junio C Hamano [Fri, 26 Apr 2013 22:28:34 +0000 (15:28 -0700)]
Merge branch 'ph/rebase-original'

* ph/rebase-original:
  rebase: find orig_head unambiguously

8 years agoMerge branch 'jn/glossary-revision'
Junio C Hamano [Fri, 26 Apr 2013 22:28:23 +0000 (15:28 -0700)]
Merge branch 'jn/glossary-revision'

The wording for "revision" in the glossary wanted to say it refers
to "commit (noun) as a concept" but it was badly phrased.

This may need further updates to hint that in contexts where it is
clear, the word may refer to an object name, not necessarily a
commit. But the patch as-is is already an improvement.

* jn/glossary-revision:
  glossary: a revision is just a commit

8 years agoMerge branch 'jc/add-ignore-removal'
Junio C Hamano [Fri, 26 Apr 2013 22:28:09 +0000 (15:28 -0700)]
Merge branch 'jc/add-ignore-removal'

Introduce "--ignore-removal" as a synonym to "--no-all" for "git
add", and improve the 2.0 migration warning with it.

* jc/add-ignore-removal:
  git add: rephrase -A/--no-all warning
  git add: --ignore-removal is a better named --no-all

8 years agoremote-bzr: strip extra newline
Felipe Contreras [Fri, 26 Apr 2013 21:12:38 +0000 (16:12 -0500)]
remote-bzr: strip extra newline

It's added by fast-export, the user didn't type it.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-bzr: tell bazaar to be quiet
Felipe Contreras [Fri, 26 Apr 2013 21:12:37 +0000 (16:12 -0500)]
remote-bzr: tell bazaar to be quiet

Otherwise we get notification, progress bars, and what not.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-bzr: store converted URL
Felipe Contreras [Fri, 26 Apr 2013 21:12:36 +0000 (16:12 -0500)]
remote-bzr: store converted URL

Bazaar might convert the URL to something more appropriate, like an
absolute path. Lets store that instead of the original URL, which won't
work from a different working directory if it's relative.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: use hashlib instead of hg sha1 util
Felipe Contreras [Fri, 26 Apr 2013 21:12:35 +0000 (16:12 -0500)]
remote-hg: use hashlib instead of hg sha1 util

To be in sync with remote-bzr.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-bzr: add support to push URLs
Felipe Contreras [Fri, 26 Apr 2013 21:12:34 +0000 (16:12 -0500)]
remote-bzr: add support to push URLs

Just like in remote-hg.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-bzr: fix bad state issue
Felipe Contreras [Fri, 26 Apr 2013 21:12:33 +0000 (16:12 -0500)]
remote-bzr: fix bad state issue

Carried from remote-hg.

The problem reportedly happened after doing a push that fails, the abort
causes the state of remote-hg to go bad, this happens because
remote-hg's marks are not stored, but 'git fast-export' marks are.

Ensure that the marks are _always_ stored.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: remove extra check
Felipe Contreras [Fri, 26 Apr 2013 21:12:32 +0000 (16:12 -0500)]
remote-hg: remove extra check

Not needed since we use xrange ourselves.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-helpers: trivial cleanups
Felipe Contreras [Fri, 26 Apr 2013 21:12:31 +0000 (16:12 -0500)]
remote-helpers: trivial cleanups

No functional changes. Typos, unused variables, redundant operations,
and white-spaces.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'fc/remote-hg'
Junio C Hamano [Fri, 26 Apr 2013 22:19:03 +0000 (15:19 -0700)]
Merge branch 'fc/remote-hg'

* fc/remote-hg:
  remote-hg: strip extra newline
  remote-hg: use marks instead of inlined files
  remote-hg: small performance improvement
  remote-hg: allow refs with spaces
  remote-hg: don't update bookmarks unnecessarily
  remote-hg: add support for schemes extension
  remote-hg: improve email sanitation
  remote-hg: add custom local tag write code
  remote-hg: write tags in the appropriate branch
  remote-hg: custom method to write tags
  remote-hg: add support for tag objects
  remote-hg: add branch_tip() helper
  remote-hg: properly mark branches up-to-date
  remote-hg: use python urlparse
  remote-hg: safer bookmark pushing
  remote-helpers: avoid has_key

8 years agoMerge branch 'fc/remote-bzr'
Junio C Hamano [Fri, 26 Apr 2013 22:18:26 +0000 (15:18 -0700)]
Merge branch 'fc/remote-bzr'

* fc/remote-bzr:
  remote-bzr: use proper push method

8 years agoMerge branch 'jc/warn-pathless-add-finishing-touches'
Junio C Hamano [Fri, 26 Apr 2013 22:17:48 +0000 (15:17 -0700)]
Merge branch 'jc/warn-pathless-add-finishing-touches'

* jc/warn-pathless-add-finishing-touches:
  git add: avoid "-u/-A without pathspec" warning on stat-dirty paths

8 years agogit add: avoid "-u/-A without pathspec" warning on stat-dirty paths
Junio C Hamano [Fri, 26 Apr 2013 20:44:35 +0000 (13:44 -0700)]
git add: avoid "-u/-A without pathspec" warning on stat-dirty paths

In preparation for Git 2.0, "git add -u/-A" without pathspec checks
all the working tree (not limited to the current directory) and
issues a warning when it finds any path that we might add in Git
2.0, because that would mean the users' fingers need to be trained
to explicitly say "." if they want to keep the current behaviour.

However, the check was incomplete, because "git add" usually does
not refresh the index, considers a path that is stat-dirty but has
contents that is otherwise up-to-date in the index as "we might
add", and relies on that it is a no-op to add the same thing again
via the add_file_to_index() API (which also knows not to say "added"
in verbose mode when this happens).  We do not want to trigger the
warning for a path that is outside the current directory is merely
stat-dirty, as it won't be added in Git 2.0, either.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
8 years agoSync with 1.8.2.2
Junio C Hamano [Fri, 26 Apr 2013 20:00:42 +0000 (13:00 -0700)]
Sync with 1.8.2.2

8 years agoGit 1.8.2.2 v1.8.2.2
Junio C Hamano [Fri, 26 Apr 2013 18:30:08 +0000 (11:30 -0700)]
Git 1.8.2.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/a-thread-only-dies-once' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:25:59 +0000 (11:25 -0700)]
Merge branch 'jk/a-thread-only-dies-once' into maint

* jk/a-thread-only-dies-once:
  run-command: use thread-aware die_is_recursing routine
  usage: allow pluggable die-recursion checks

8 years agoMerge branch 'jn/gitweb-install-doc' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:12:48 +0000 (11:12 -0700)]
Merge branch 'jn/gitweb-install-doc' into maint

* jn/gitweb-install-doc:
  gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
  gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM

8 years agoMerge branch 'fc/untracked-zsh-prompt' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:12:30 +0000 (11:12 -0700)]
Merge branch 'fc/untracked-zsh-prompt' into maint

* fc/untracked-zsh-prompt:
  prompt: fix untracked files for zsh

8 years agoMerge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:12:17 +0000 (11:12 -0700)]
Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint

* jk/receive-pack-deadlocks-with-early-failure:
  receive-pack: close sideband fd on early pack errors

8 years agoMerge branch 'jk/chopped-ident' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:11:51 +0000 (11:11 -0700)]
Merge branch 'jk/chopped-ident' into maint

* jk/chopped-ident:
  blame: handle broken commit headers gracefully
  pretty: handle broken commit headers gracefully
  cat-file: print tags raw for "cat-file -p"

8 years agoMerge branch 'rt/commentchar-fmt-merge-msg' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:10:47 +0000 (11:10 -0700)]
Merge branch 'rt/commentchar-fmt-merge-msg' into maint

* rt/commentchar-fmt-merge-msg:
  t6200: avoid path mangling issue on Windows
  fmt-merge-msg: use core.commentchar in tag signatures completely
  fmt-merge-msg: respect core.commentchar in people credits

8 years agoMerge branch 'rs/empty-archive' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:03:31 +0000 (11:03 -0700)]
Merge branch 'rs/empty-archive' into maint

* rs/empty-archive:
  t5004: fix issue with empty archive test and bsdtar

8 years agoMerge branch 'pe/pull-rebase-v-q' into maint
Junio C Hamano [Fri, 26 Apr 2013 18:00:14 +0000 (11:00 -0700)]
Merge branch 'pe/pull-rebase-v-q' into maint

* pe/pull-rebase-v-q:
  pull: Apply -q and -v options to rebase mode as well

8 years agot7409: do not use export X=Y
Torsten Bögershausen [Fri, 26 Apr 2013 09:18:28 +0000 (11:18 +0200)]
t7409: do not use export X=Y

The shell syntax "export X=Y A=B" is not understood by all shells.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agotest-hg-hg-git.sh: do not use export X=Y
Torsten Bögershausen [Fri, 26 Apr 2013 09:17:43 +0000 (11:17 +0200)]
test-hg-hg-git.sh: do not use export X=Y

The shell syntax "export X=Y" is not understood by all shells.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agotest-hg-bidi.sh: do not use export X=Y
Torsten Bögershausen [Fri, 26 Apr 2013 09:17:56 +0000 (11:17 +0200)]
test-hg-bidi.sh: do not use export X=Y

The shell syntax "export X=Y A=B" is not understood by all shells.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot9501: do not use export X=Y
Torsten Bögershausen [Fri, 26 Apr 2013 09:18:07 +0000 (11:18 +0200)]
t9501: do not use export X=Y

The shell syntax "export X=Y" is not understood by all shells.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot9020: do not use export X=Y
Torsten Bögershausen [Fri, 26 Apr 2013 09:18:16 +0000 (11:18 +0200)]
t9020: do not use export X=Y

The shell syntax "export X=Y" is not understood by all shells.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-bzr: use proper push method
Felipe Contreras [Thu, 25 Apr 2013 11:25:37 +0000 (06:25 -0500)]
remote-bzr: use proper push method

Do not just randomly synchronize the revisions with no checks at
all.

I don't have any evidence that there's anything wrong with the
current code, which Bazaar seems to use, but for different purposes.
Let's use the logic Bazaar UI uses to avoid surprises.

Also, add a non-ff check.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agopretty: remove intermediate strbufs from pp_user_info()
René Scharfe [Thu, 25 Apr 2013 19:43:56 +0000 (21:43 +0200)]
pretty: remove intermediate strbufs from pp_user_info()

Use namebuf/namelen and mailbuf/maillen directly instead of copying
their contents into strbufs first.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agopretty: simplify output line length calculation in pp_user_info()
René Scharfe [Thu, 25 Apr 2013 19:41:57 +0000 (21:41 +0200)]
pretty: simplify output line length calculation in pp_user_info()

Keep namelen unchanged and don't use it to hold a value that we're not
interested in anyway -- we can use maillen and the constant part
directly instead.  This simplifies the code slightly and prepares for
the next patch that makes use of the original value of namelen.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agopretty: simplify input line length calculation in pp_user_info()
René Scharfe [Thu, 25 Apr 2013 19:40:25 +0000 (21:40 +0200)]
pretty: simplify input line length calculation in pp_user_info()

Instead of searching for LF and NUL with two strchr() calls use a single
strchrnul() call.  We don't need to check if the returned pointer is NULL
because either we'll find the NUL at the end of line, or the caller
forgot to NUL-terminate the string and we'll overrun the buffer in any
case.  Also we don't need to pass LF or NUL to split_ident_line() as it
ignores it anyway.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobash-prompt.sh: show where rebase is at when stopped
Zoltan Klinger [Thu, 25 Apr 2013 09:28:54 +0000 (19:28 +1000)]
bash-prompt.sh: show where rebase is at when stopped

When a rebase stops (e.g. interrupted by a merge conflict), it could
be useful to know how far a rebase has progressed and how many
commits in total this rebase will apply. Teach the __git_ps1()
command to display the number of commits so far applied and the
total number of commits to be applied, like this:

  ((3ec0a6a...)|REBASE 2/5)

In the example above the rebase has stopped at the second commit due to
a merge conflict and there are a total number of five commits to be
applied by this rebase.

This information can be already obtained from the following files which are
being generated during the rebase:

    GIT_DIR/.git/rebase-merge/msgnum (git-rebase--merge.sh)
    GIT_DIR/.git/rebase-merge/end    (git-rebase--merge.sh)
    GIT_DIR/.git/rebase-apply/next   (git-am.sh)
    GIT_DIR/.git/rebase-apply/last   (git-am.sh)

but "rebase -i" does not leave necessary clues.

Implement this feature by doing these three things:

  1) Modify git-rebase--interactive.sh to also create

GIT_DIR/.git/rebase-merge/msgnum
GIT_DIR/.git/rebase-merge/end

     files for the number of commits so far applied and the total
     number of commits to be applied.

  2) Modify git-prompt.sh to read and display info from the above
     files.

  3) Update test t9903-bash-prompt.sh to reflect changes introduced
     by this patch.

Signed-off-by: Zoltan Klinger <zoltan.klinger@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/remote-helper-with-signed-tags'
Junio C Hamano [Wed, 24 Apr 2013 23:30:50 +0000 (16:30 -0700)]
Merge branch 'jk/remote-helper-with-signed-tags'

Allows remote-helpers to declare they can handle signed tags, and
issue a warning when using those that don't.

* jk/remote-helper-with-signed-tags:
  transport-helper: add 'signed-tags' capability
  transport-helper: pass --signed-tags=warn-strip to fast-export
  fast-export: add --signed-tags=warn-strip mode

8 years agoSync with maint
Junio C Hamano [Wed, 24 Apr 2013 23:30:04 +0000 (16:30 -0700)]
Sync with maint

* maint:
  Update draft release notes to 1.8.2.2
  completion: remove duplicate block for "git commit -c"
  cherry-pick/revert: make usage say '<commit-ish>...'

8 years agoUpdate draft release notes to 1.8.2.2
Junio C Hamano [Wed, 24 Apr 2013 23:22:07 +0000 (16:22 -0700)]
Update draft release notes to 1.8.2.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/diff-algo-finishing-touches' into maint
Junio C Hamano [Wed, 24 Apr 2013 23:17:13 +0000 (16:17 -0700)]
Merge branch 'jk/diff-algo-finishing-touches' into maint

"git diff --diff-algorithm=algo" was understood by the command line
parser, but "git diff --diff-algorithm algo" was not.

* jk/diff-algo-finishing-touches:
  diff: allow unstuck arguments with --diff-algorithm
  git-merge(1): document diff-algorithm option to merge-recursive

8 years agoMerge branch 'sr/log-SG-no-textconv' into maint
Junio C Hamano [Wed, 24 Apr 2013 23:15:44 +0000 (16:15 -0700)]
Merge branch 'sr/log-SG-no-textconv' into maint

"git log -S/-G" started paying attention to textconv filter, but
there was no way to disable this.  Make it honor --no-textconv
option.

* sr/log-SG-no-textconv:
  diffcore-pickaxe: unify code for log -S/-G
  diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
  diffcore-pickaxe: port optimization from has_changes() to diff_grep()
  diffcore-pickaxe: respect --no-textconv
  diffcore-pickaxe: remove fill_one()
  diffcore-pickaxe: remove unnecessary call to get_textconv()

8 years agoMerge branch 'jc/merge-tag-object' into maint
Junio C Hamano [Wed, 24 Apr 2013 23:14:06 +0000 (16:14 -0700)]
Merge branch 'jc/merge-tag-object' into maint

"git merge $(git rev-parse v1.8.2)" behaved quite differently from
"git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did
not pay much attention to the annotated tag payload.  Make the code
notice the type of the tag object, in addition to the dwim_ref()
based classification the current code uses (i.e. the name appears in
refs/tags/) to decide when to special case merging of tags.

* jc/merge-tag-object:
  t6200: test message for merging of an annotated tag
  t6200: use test_config/test_unconfig
  merge: a random object may not necssarily be a commit

8 years agocompletion: remove duplicate block for "git commit -c"
Mårten Kongstad [Wed, 24 Apr 2013 20:49:06 +0000 (22:49 +0200)]
completion: remove duplicate block for "git commit -c"

Remove one of two consecutive, identical blocks for "git commit -c".

This was caused by a mechanical mismerge at d931e2fb252e (Merge
branch 'mp/complete-paths', 2013-02-08).  The side branch wanted to
add this block at fea16b47 but the same fix was done independently
at 685397585 already.

Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote: 'show' and 'prune' can take more than one remote
Thomas Rast [Wed, 24 Apr 2013 13:54:37 +0000 (15:54 +0200)]
remote: 'show' and 'prune' can take more than one remote

The 'git remote show' and 'prune' subcommands are documented as taking
only a single remote name argument, but that is not the case; they
will simply iterate the action over all remotes given.  Update the
documentation and tests to match.

With the last user of the -f flag gone, we also remove the code
supporting it.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote: check for superfluous arguments in 'git remote add'
Thomas Rast [Wed, 24 Apr 2013 13:54:36 +0000 (15:54 +0200)]
remote: check for superfluous arguments in 'git remote add'

The 'git remote add' subcommand did not check for superfluous command
line arguments.  Make it so.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote: add a test for extra arguments, according to docs
Thomas Rast [Wed, 24 Apr 2013 13:54:35 +0000 (15:54 +0200)]
remote: add a test for extra arguments, according to docs

This adds one test or comment for each subcommand of git-remote
according to its current documentation.  All but 'set-branches' and
'update' are listed as taking only a fixed number of arguments; for
those we can write a test with one more (bogus) argument, and see if
the command notices that.

They fail on several counts: 'add' does not check for extra arguments,
and 'show' and 'prune' actually iterate over remotes (i.e., take any
number of args).  We'll fix them in the next two patches.

The -f machinery is only there to make the tests readable while still
ensuring they pass as a whole, and will be removed in the final patch.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agocherry-pick/revert: make usage say '<commit-ish>...'
Kevin Bracey [Mon, 22 Apr 2013 15:57:37 +0000 (18:57 +0300)]
cherry-pick/revert: make usage say '<commit-ish>...'

The usage string for cherry-pick and revert has never been updated to
reflect their ability to handle multiple commits. Other documentation is
already correct.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Wed, 24 Apr 2013 05:55:33 +0000 (22:55 -0700)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: de.po: translate 54 new messages
  l10n: zh_CN.po: translate 54 messages (2048t0f0u)
  l10n: Update Swedish translation (2048t0f0u)
  l10n: vi.po: Update translation (2048t0u0f)
  l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)

8 years agorebase: find orig_head unambiguously
Phil Hord [Tue, 23 Apr 2013 22:51:14 +0000 (18:51 -0400)]
rebase: find orig_head unambiguously

When we 'git rebase $upstream', git uses 'rev-parse --verify
$current_branch' to find ORIG_HEAD.  But if $current_branch
is ambiguous, 'rev-parse --verify' emits a warning and returns
a SHA1 anyway.  When the wrong ambiguous choice is used,
git-rebase fails non-gracefully:  it emits a warning about
failing to lock $current_branch, an error about being unable to
checkout $current_branch again, and it might even decide the
rebase is a fast-forward when it is not.

In the 'rebase $upstream' case, we already know the unambiguous
spelling of $current_branch is "HEAD".  Fix git-rebase to find
$orig_head unambiguously.

Add a test in t3400-rebase.sh which creates an ambiguous branch
name and rebases it implicitly with 'git rebase $other'.

Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUpdate draft release notes to 1.8.3
Junio C Hamano [Tue, 23 Apr 2013 18:27:15 +0000 (11:27 -0700)]
Update draft release notes to 1.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'nd/pretty-formats'
Junio C Hamano [Tue, 23 Apr 2013 18:22:48 +0000 (11:22 -0700)]
Merge branch 'nd/pretty-formats'

pretty-printing body of the commit that is stored in non UTF-8
encoding did not work well.  The early part of this series fixes
it.  And then it adds %C(auto) specifier that turns the coloring on
when we are emitting to the terminal, and adds column-aligning
format directives.

* nd/pretty-formats:
  pretty: support %>> that steal trailing spaces
  pretty: support truncating in %>, %< and %><
  pretty: support padding placeholders, %< %> and %><
  pretty: add %C(auto) for auto-coloring
  pretty: split color parsing into a separate function
  pretty: two phase conversion for non utf-8 commits
  utf8.c: add reencode_string_len() that can handle NULs in string
  utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
  utf8.c: move display_mode_esc_sequence_len() for use by other functions
  pretty: share code between format_decoration and show_decorations
  pretty-formats.txt: wrap long lines
  pretty: get the correct encoding for --pretty:format=%e
  pretty: save commit encoding from logmsg_reencode if the caller needs it

8 years agoMerge branch 'kb/status-ignored-optim-2'
Junio C Hamano [Tue, 23 Apr 2013 18:21:23 +0000 (11:21 -0700)]
Merge branch 'kb/status-ignored-optim-2'

Fixes a handful of issues in the code to traverse working tree to
find untracked and/or ignored files, cleans up and optimizes the
codepath in general.

* kb/status-ignored-optim-2:
  dir.c: git-status --ignored: don't scan the work tree twice
  dir.c: git-status --ignored: don't scan the work tree three times
  dir.c: git-status: avoid is_excluded checks for tracked files
  dir.c: replace is_path_excluded with now equivalent is_excluded API
  dir.c: unify is_excluded and is_path_excluded APIs
  dir.c: move prep_exclude
  dir.c: factor out parts of last_exclude_matching for later reuse
  dir.c: git-clean -d -X: don't delete tracked directories
  dir.c: make 'git-status --ignored' work within leading directories
  dir.c: git-status --ignored: don't list empty directories as ignored
  dir.c: git-ls-files --directories: don't hide empty directories
  dir.c: git-status --ignored: don't list empty ignored directories
  dir.c: git-status --ignored: don't list files in ignored directories
  dir.c: git-status --ignored: don't drop ignored directories

8 years agoMerge branch 'jn/gitweb-install-doc'
Junio C Hamano [Tue, 23 Apr 2013 18:17:07 +0000 (11:17 -0700)]
Merge branch 'jn/gitweb-install-doc'

Reword gitweb configuration instrutions.

* jn/gitweb-install-doc:
  gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
  gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM

8 years agoMerge branch 'fc/untracked-zsh-prompt'
Junio C Hamano [Tue, 23 Apr 2013 18:16:58 +0000 (11:16 -0700)]
Merge branch 'fc/untracked-zsh-prompt'

* fc/untracked-zsh-prompt:
  prompt: fix untracked files for zsh

8 years agoMerge branch 'jk/receive-pack-deadlocks-with-early-failure'
Junio C Hamano [Tue, 23 Apr 2013 18:16:50 +0000 (11:16 -0700)]
Merge branch 'jk/receive-pack-deadlocks-with-early-failure'

When receive-pack detects error in the pack header it received in
order to decide which of unpack-objects or index-pack to run, it
returned without closing the error stream, which led to a hang
sideband thread.

* jk/receive-pack-deadlocks-with-early-failure:
  receive-pack: close sideband fd on early pack errors

8 years agobisect: Log possibly bad, skipped commits at bisection end
Torstein Hegge [Mon, 22 Apr 2013 21:02:29 +0000 (23:02 +0200)]
bisect: Log possibly bad, skipped commits at bisection end

If the bisection completes with only skipped commits left to as possible
first bad commit, output the list of possible first bad commits to human
readers of the bisection log.

Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: strip extra newline
Felipe Contreras [Mon, 22 Apr 2013 21:55:24 +0000 (16:55 -0500)]
remote-hg: strip extra newline

There's no functional change since mercurial commit operation strips
that anyway, but that's no excuse for us not to do the right thing. So
let's be explicit about it.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: use marks instead of inlined files
Felipe Contreras [Mon, 22 Apr 2013 21:55:23 +0000 (16:55 -0500)]
remote-hg: use marks instead of inlined files

So that we can find already exported ones. We can never be 100% sure
that we already exported such data, due to mercurial design, it at least
sometimes we should detect them, and so should give us some performance
boost.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: small performance improvement
Felipe Contreras [Mon, 22 Apr 2013 21:55:22 +0000 (16:55 -0500)]
remote-hg: small performance improvement

Load previous manifest first as Mercurial does; for caching reasons.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: allow refs with spaces
Felipe Contreras [Mon, 22 Apr 2013 21:55:21 +0000 (16:55 -0500)]
remote-hg: allow refs with spaces

Mercurial supports them, Git doesn't.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: don't update bookmarks unnecessarily
Felipe Contreras [Mon, 22 Apr 2013 21:55:20 +0000 (16:55 -0500)]
remote-hg: don't update bookmarks unnecessarily

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: add support for schemes extension
Felipe Contreras [Mon, 22 Apr 2013 21:55:19 +0000 (16:55 -0500)]
remote-hg: add support for schemes extension

So that we can use shortened URLs, for example 'bb:://felipec/repo'
(Bitbucket).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: improve email sanitation
Felipe Contreras [Mon, 22 Apr 2013 21:55:18 +0000 (16:55 -0500)]
remote-hg: improve email sanitation

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: add custom local tag write code
Felipe Contreras [Mon, 22 Apr 2013 21:55:17 +0000 (16:55 -0500)]
remote-hg: add custom local tag write code

There's no point in calling the tag method for such simple action. Not
that we care much about the hg-git compat mode, it's mostly just for
comparison testing purposes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoremote-hg: write tags in the appropriate branch
Felipe Contreras [Mon, 22 Apr 2013 21:55:16 +0000 (16:55 -0500)]
remote-hg: write tags in the appropriate branch

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>