author | Junio C Hamano <gitster@pobox.com> | |
Mon, 2 May 2011 22:58:36 +0000 (15:58 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 2 May 2011 22:58:36 +0000 (15:58 -0700) |
* nm/submodule-update-force:
submodule: Add --force option for git submodule update
Conflicts:
t/t7406-submodule-update.sh
submodule: Add --force option for git submodule update
Conflicts:
t/t7406-submodule-update.sh
Documentation/git-submodule.txt | patch | blob | history | |
git-submodule.sh | patch | blob | history | |
t/t7406-submodule-update.sh | patch | blob | history |
index 1a16ff60448a72bebcba2daff7dbabc5feed8a4c..5e7a4130eeec48c27abf92b37834613692446723 100644 (file)
-f::
--force::
- This option is only valid for the add command.
- Allow adding an otherwise ignored submodule path.
+ This option is only valid for add and update commands.
+ When running add, allow adding an otherwise ignored submodule path.
+ When running update, throw away local changes in submodules when
+ switching to a different commit.
--cached::
This option is only valid for status and summary commands. These
diff --git a/git-submodule.sh b/git-submodule.sh
index b010a673097a9cfcf009b307114669b6221d066c..bf110e9cb77a0e9930c427408e18d323db2c8916 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
or: $dashless [--quiet] init [--] [<path>...]
- or: $dashless [--quiet] update [--init] [-N|--no-fetch] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
+ or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
or: $dashless [--quiet] foreach [--recursive] <command>
or: $dashless [--quiet] sync [--] [<path>...]"
-N|--no-fetch)
nofetch=1
;;
+ -f|--force)
+ force=$1
+ ;;
-r|--rebase)
update="rebase"
;;
if test "$subsha1" != "$sha1"
then
- force=
- if test -z "$subsha1"
+ subforce=$force
+ # If we don't already have a -f flag and the submodule has never been checked out
+ if test -z "$subsha1" -a -z "$force"
then
- force="-f"
+ subforce="-f"
fi
if test -z "$nofetch"
msg="merged in"
;;
*)
- command="git checkout $force -q"
+ command="git checkout $subforce -q"
action="checkout"
msg="checked out"
;;
index bf7c788735d6e3e0ecf56e7a2f82826701ee1789..4f16fcce2bfcb63f437fa6b495fdb5c4370fccc1 100755 (executable)
! test -s actual.err
'
+test_expect_success 'submodule update should fail due to local changes' '
+ (cd super/submodule &&
+ git reset --hard HEAD~1 &&
+ echo "local change" > file
+ ) &&
+ (cd super &&
+ (cd submodule &&
+ compare_head
+ ) &&
+ test_must_fail git submodule update submodule
+ )
+'
+test_expect_success 'submodule update should throw away changes with --force ' '
+ (cd super &&
+ (cd submodule &&
+ compare_head
+ ) &&
+ git submodule update --force submodule &&
+ cd submodule &&
+ ! compare_head
+ )
+'
+
test_expect_success 'submodule update --rebase staying on master' '
(cd super/submodule &&
git checkout master