Currently, the --no-deref and --stdin options of update-ref cannot be used together (the code aborts immediately with a usage message), though it makes sense to do so and is easier than repeatedly specifying on stdin that each ref should not be dereferenced. Also, the documentation for the --no-deref option has a few problems, making it unclear what it is and isn't compatible with. The first patch is just a minor code fixup that the second lightly depends on. The second patch has the changes to fix the issues stated above. Elijah Newren (2): update-ref: fix type of update_flags variable to match its usage update-ref: allow --no-deref with --stdin Documentation/git-update-ref.txt | 2 +- builtin/update-ref.c | 25 ++++++++++++++----------- t/t1400-update-ref.sh | 31 +++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 12 deletions(-) -- 2.19.0.rc2.2.g1aedc61e22
