]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/prefix-filename'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Mar 2017 17:59:26 +0000 (10:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Mar 2017 17:59:26 +0000 (10:59 -0700)
Code clean-up with minor bugfixes.

* jk/prefix-filename:
  bundle: use prefix_filename with bundle path
  prefix_filename: simplify windows #ifdef
  prefix_filename: return newly allocated string
  prefix_filename: drop length parameter
  prefix_filename: move docstring to header file
  hash-object: fix buffer reuse with --path in a subdirectory

1  2 
builtin/rev-parse.c
cache.h

Simple merge
diff --cc cache.h
Simple merge