Skip to content

Commit 728ad26

Browse files
author
Dave Abrahams
committed
utils/update-checkout: support autostash when pulling
Setting rebase.autostash allows one to do an update-checkout with a dirty working tree.
1 parent f9c2cd1 commit 728ad26

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

test/Prototypes/Integers.swift.gyb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,11 @@ extension IntegerType {
215215
}
216216
}
217217

218+
//===--- SignExtending ----------------------------------------------------===//
219+
// A SignedIntegerType wrapper over any UnsignedIntegerType; it
220+
// represents the full width of the unsigned number by adding bits
221+
// to the representation.
222+
218223
//===--- Homogeneous comparison -------------------------------------------===//
219224
@_transparent
220225
@warn_unused_result

utils/update-checkout

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ def update_working_copy(repo_path):
5050
if os.path.isdir(os.path.join(".git", "svn")):
5151
update_git_svn(repo_path)
5252
elif os.path.isdir(".git"):
53-
check_call([ "git", "pull", "--rebase" ])
53+
# Prior to Git 2.6, this is the way to do a "git pull
54+
# --rebase" that respects rebase.autostash. See
55+
# http://stackoverflow.com/a/30209750/125349
56+
check_call([ "git", "fetch" ])
57+
check_call([ "git", "rebase", "FETCH_HEAD" ])
5458
else:
5559
check_call([ "svn", "update" ])
5660

0 commit comments

Comments
 (0)