summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2012-02-25 20:06:25 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-26 16:14:29 -0800
commit543987bd475abae502939eb3db9c6879fde09c88 (patch)
treebd4dfe130eac3d9787c449b34d8895c685f93557 /fmt-merge-msg.h
parentgit-p4: set useClientSpec variable on initial clone (diff)
downloadtgif-543987bd475abae502939eb3db9c6879fde09c88.tar.xz
git-p4: fix submit regression with clientSpec and subdir clone
When the --use-client-spec is given to clone, and the clone path is a subset of the full tree as specified in the client, future submits will go to the wrong place. Factor out getClientSpec() so both clone/sync and submit can use it. Introduce getClientRoot() that is needed for the client spec case, and use it instead of p4Where(). Test the five possible submit behaviors (add, modify, rename, copy, delete). Reported-by: Laurent Charrière <lcharriere@promptu.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions