Commits

Commit:
35d2583f834a66f801dc229002d45e735882ba78
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow no-op merge commits to be created Requested by James Cook
diff | patch | tree
Commit:
af179be739cacd6576fdf9596ac7e61b714ee367
From:
Stefan Sperling <stsp@stsp.name>
Date:
when aborting rebase/histedit/merge, unlink files added by merged changes Otherwise we leave unversioned files behind in the work tree which may interfere with new attempts to rebase or merge the changes again. Problem found by + ok naddy@
diff | patch | tree
Commit:
d51d11be9ba86c2c5cf8d36994e56eeccb905865
From:
Omar Polo <op@omarpolo.com>
Date:
fix 'got merge' so it parses gitconfig for author cmd_merge is the only subcommand that may create commits that doesn't parse the git config files, thusly failing for users without GOT_AUTHOR defined. Problem reported by James Cook who also provided an initial test case, thanks! ok jamsek
diff | patch | tree
Commit:
b2b3fce13e4eca588bb28a869b07f0063568b505
From:
Omar Polo <op@omarpolo.com>
Date:
respect umask when creating or changing files and directories This behaviour is already documented in got-worktree(5) but wasn't actually implemented. ok stsp@
diff | patch | tree
Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
From:
Josiah Frentsos <jfrent@tilde.team>
Via:
Stefan Sperling <stsp@stsp.name>
Date:
remove trailing whitespace; patch by Josiah Frentsos
diff | patch | tree
Commit:
49c543a6fe888394ca86e6399c706a9965486134
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use test(1) -eq and -ne to compare integers, and reduce quoting This brings the rest of the regression test scripts in line with patch.sh.
diff | patch | tree
Commit:
10b394ac1c027dbd5663bfa1269707d1f8930f3e
From:
Thomas Adam <thomas@xteddy.org>
Date:
regress: make merge.sh more POSIXy Don't use '==' for equality matching in sh, as this won't work across all shells. ok @naddy
diff | patch | tree
Commit:
41f061b2f459318f3738f59d7676efccc4beb344
From:
Stefan Sperling <stsp@stsp.name>
Date:
ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick
diff | patch | tree
Commit:
c1b057235b48f7b8bc01bd3c31348517856bc68b
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
diff | patch | tree
Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
From:
Stefan Sperling <stsp@stsp.name>
Date:
print additional stats about things that went wrong during a merge
diff | patch | tree
Commit:
0ff8d236625b5d8329e10e9b812cbdef76917ba6
From:
Stefan Sperling <stsp@stsp.name>
Date:
show commit progress output when 'got merge -c' is used Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@
diff | patch | tree
Commit:
088449d31db27c8682d5e9dc737d92d05df6605e
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got merge -n' which interrupts before creating a merge commit
diff | patch | tree
Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
From:
Stefan Sperling <stsp@stsp.name>
Date:
make it possible to merge vendor branches with 'got merge'
diff | patch | tree
Commit:
5267b9e4960076d7de62633b9f5f1dcdb6594b33
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow bad symlinks to survive a merge Commands which perform merges will now install bad symlinks as symlinks in the work tree, instead of creating them as regular files. This means bad symlinks committed with 'got commit -S' (or Git) will be preserved. The decision to introduce a bad symlink is done at commit-time and merges should not forcefully reverse this decision. The cherrypick and backout commands require a manual commit step, and a merge result with bad symlinks will require use of 'got commit -S'. Additional testing by thomas adam
diff | patch | tree
Commit:
1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
From:
Stefan Sperling <stsp@stsp.name>
Date:
stop caring about obstructed versioned files in 'got merge' Tyring to write a test to cover this case I found that obstructed files are (correctly) detected as local modifications in the work tree. Thus they trigger the pre-condition check for local modications and 'got merge' will not even start to do any work in the presence of obstructed files.
diff | patch | tree