delta/git.git, branch jd/subtree

contrib/subtree: allow adding an annotated tag

2014-05-13T19:33:26+00:00

cmd_add_commit() is passed FETCH_HEAD by cmd_add_repository, which
is then rev-parsed into an object name.  However, if the user is
fetching a tag rather than a branch HEAD, such as by executing:

  $ git subtree add -P oldGit https://github.com/git/git.git tags/v1.8.0

the object name refers to a tag and is never peeled, and the git
commit-tree call (line 561) slaps us in the face because it doesn't
peel tags to commits.

Because peeling a committish doesn't do anything if it's already a
commit, fix by peeling the object name before assigning it to $rev
using peel_committish() from git:git-sh-setup.sh, a pre-existing
dependency of git-subtree.

Reported-by: Kevin Cagle 
Helped-by: Junio C Hamano 
Signed-off-by: James Denholm 
Signed-off-by: Junio C Hamano

contrib/subtree/Makefile: clean up rule for "clean"

2014-05-06T22:36:17+00:00

git:Documentation/Makefile and others establish "RM ?= rm -f" as a
convention for rm calls in clean rules, hence follow this convention
instead of simply forcing clean to use rm.

subproj and mainline no longer need to be removed in clean, as they are
no longer created in git:contrib/subtree by "make test". Hence, remove
the rm call for those folders.

Other makefiles don't remove "*~" files, remove the rm call to prevent
unexpected behaviour in the future. Similarly, clean doesn't remove the
installable file, so rectify this.

Reviewed-by: Jeff King 
Signed-off-by: James Denholm 
Signed-off-by: Junio C Hamano

contrib/subtree/Makefile: clean up rules to generate documentation

2014-05-06T22:35:52+00:00

git:Documentation/Makefile establishes asciidoc/xmlto calls as being
handled through their appropriate variables, Hence, change to bring into
congruency with.

Similarly, MANPAGE_XSL exists in git:Documentation/Makefile, while
MANPAGE_NORMAL_XSL does not outside contrib/subtree. Hence, replace
MANPAGE_NORMAL_XSL with MANPAGE_XSL.

Reviewed-by: Jeff King 
Signed-off-by: James Denholm 
Signed-off-by: Junio C Hamano

contrib/subtree/Makefile: s/libexecdir/gitexecdir/

2014-05-06T22:35:41+00:00

$(libexecdir) isn't used anywhere else in the project, while
$(gitexecdir) is the standard in the other appropriate makefiles. Hence,
replace the former with the latter.

Reviewed-by: Jeff King 
Signed-off-by: James Denholm 
Signed-off-by: Junio C Hamano

contrib/subtree/Makefile: use GIT-VERSION-FILE

2014-05-06T22:35:31+00:00

GVF is already being used in most/all other makefiles in the project,
and has been for _quite_ a while. Hence, drop file-unique gitver and
replace with GIT_VERSION.

Reviewed-by: Jeff King 
Signed-off-by: James Denholm 
Signed-off-by: Junio C Hamano

contrib/subtree/Makefile: scrap unused $(gitdir)

2014-05-06T19:20:31+00:00

In 7ff8463dba0d74fc07a766bed457ae7afcc902b5, the references to gitdir
were removed but the assignment itself wasn't. Hence, drop the gitdir
assignment.

Reviewed-by: Jeff King 
Signed-off-by: James Denholm 
Signed-off-by: Junio C Hamano

Git 2.0-rc2

2014-05-02T20:15:52+00:00

Merge branch 'mw/symlinks'

2014-05-02T20:11:03+00:00

A finishing touch fix to a new change already in 'master'.

* mw/symlinks:
  setup: fix windows path buffer over-stepping

Merge branch 'km/git-svn-workaround-older-getopt-long'

2014-05-02T20:10:58+00:00

* km/git-svn-workaround-older-getopt-long:
  t9117: use --prefix "" instead of --prefix=""

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

2014-05-02T20:10:53+00:00

* rh/prompt-pcmode-avoid-eval-on-refname:
  git-prompt.sh: don't put unsanitized branch names in $PS1