mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: add options --commit and --disable-rebase

Browse Source 
On a daily work with multiple local git branches, the usual way to
submit only a specified commit was to cherry-pick the commit on
master then run git-p4 submit.  It can be very annoying to switch
between local branches and master, only to submit one commit.  The
proposed new way is to select directly the commit you want to
submit.

Add option --commit to command 'git-p4 submit' in order to submit
only specified commit(s) in p4.

On a daily work developping software with big compilation time, one
may not want to rebase on his local git tree, in order to avoid long
recompilation.

Add option --disable-rebase to command 'git-p4 submit' in order to
disable rebase after submission.

Thanks-to: Cedric Borgese <cedric.borgese@gmail.com>
Reviewed-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Romain Merland <merlorom@yahoo.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Romain Merland
2018-06-01 09:46:14 +02:00
committed by Junio C Hamano
parent ccdcbd54c4
commit f55b87c1c7
3 changed files with 77 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
t/t9807-git-p4-submit.sh
View File

@ -155,6 +155,46 @@ test_expect_success 'allow submit from branch with same revision but different n
)
'
# make two commits, but tell it to apply only one
test_expect_success 'submit --commit one' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
test_commit "file9" &&
test_commit "file10" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit --commit HEAD
) &&
(
cd "$cli" &&
test_path_is_missing "file9.t" &&
test_path_is_file "file10.t"
)
'
# make three commits, but tell it to apply only range
test_expect_success 'submit --commit range' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
test_commit "file11" &&
test_commit "file12" &&
test_commit "file13" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit --commit HEAD~2..HEAD
) &&
(
cd "$cli" &&
test_path_is_missing "file11.t" &&
test_path_is_file "file12.t" &&
test_path_is_file "file13.t"
)
'
#
# Basic submit tests, the five handled cases
#