Commits

Commit:
4c662b1dc9113e3f0bbf38b33e085977f6452e27
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix test data directory name used by test_histedit_fold_add_delete
diff | patch | tree
Commit:
3a6b87604592c583079227ea995f50eb3ec74121
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
diff | patch | tree
Commit:
a96621150027f46d946238e99c8236a06f79f0da
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
add missing "return 1" to failure handling in the regress scripts ok stsp@
diff | patch | tree
Commit:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad
From:
Stefan Sperling <stsp@stsp.name>
Date:
new -X option for removing backups created by got rebase and got histedit ok semarie
diff | patch | tree
Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
From:
Stefan Sperling <stsp@stsp.name>
Date:
ensure that old commits remain referenced after rebase and histedit Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick
diff | patch | tree
Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
From:
Stefan Sperling <stsp@stsp.name>
Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
diff | patch | tree
Commit:
a615e0e7796ea1103a6e0d4b5dbb613459788666
From:
Stefan Sperling <stsp@stsp.name>
Date:
implicitly mark all files in work tree as up-to-date after rebase/histedit This should always be correct, since rebase and histedit start out with a clean and single-base-commit worktree, and end up committing all changes across the entire work tree when they are successful. tested by jrick and myself
diff | patch | tree
Commit:
a347e6bb7cfe1f6a9df6234f6949003191418466
From:
Stefan Sperling <stsp@stsp.name>
Date:
test behaviour of histedit -f with an empty log message
diff | patch | tree
Commit:
239f5c5ae4c041d2ea8dddae394ce357b016b7a1
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a basic test case for histedit -f
diff | patch | tree
Commit:
29c68398c5b5c7fc7ff5534ed3921b6faa9912a9
From:
Stefan Sperling <stsp@stsp.name>
Date:
check final repository state in test_histedit_fold_add_delete
diff | patch | tree
Commit:
0a22ca1a5a1261bb7e230db211a205b68e1c3044
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got histedit' collapse folded add+delete operations into a no-op If a merged commit wants to delete a locally added file, and this locally added file matches the content which was deleted in the commit being merged, we can go ahead with the deletion because there is no risk of data loss. fixes the histedit problem reported by jrick on freenode
diff | patch | tree
Commit:
ecfff807e1145877b3360f07915ef8e3af0e2751
From:
Stefan Sperling <stsp@stsp.name>
Date:
add an xfail test for a histedit issue where a deleted file remains If a previous commit introduces a new file, and it is folded into a commit that deletes the same file, the file still exists after the histedit. reported by jrick on freenode
diff | patch | tree
Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp
diff | patch | tree
Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a -q option to tests for quiet output and use it for 'make regress' Previous default output remains when test cases are run individually. ok tracey
diff | patch | tree
Commit:
e31abbf21f99a7312bdfd392f33ace285feadfe5
From:
Stefan Sperling <stsp@stsp.name>
Date:
add -c option to 'got ref' which now expects just one argument after options
diff | patch | tree